Match Window on the main menu and remove last plural module name.
Change imports, test, and attribute references to match new name.