Renamed some things

Had to rename some things