Renamed some ambiguous classes fixed all the problems with the compViewModel.js,Machine.js, and
MachineGroup.js