Bug 21299: (QA follow-up) Rename module and subroutine