updated naming conventions from GM o IM