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 a361e89d)
Co-authored-by: Terry Jan Reedy <tjreedy@udel.edu>