updated some bad naming