Remove _7 from the module names and more.

This is one of the major cleanups to make this a contrib module.