Cleanup some file and module names.