Changes Some variable names

after a year long debate between me and my fellow friend christian, we
finally agreed to chnage the names of the enums.