[Cleaning] Renamed some things, modified some stuff...