Renamed module files.
Fix references in code to old name.
Correct file names.