Renamed everything so i know what is what

Finally it's cleanuped tomorrow i'm going to make a code cleanup