Match Window on the main menu and remove last plural module name. Change imports, test, and attribute references to match new name. (cherry picked from commit a361e89d5a) Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>
a361e89d5a