fixing issues with double converting CMI files and cleaning up some stuff from the previous round of file name changes