Uniformity update

Changed some names to be more conform, ofcourse this brok the whole
system again so once again been playing around with stuff. Just hope
it'll work on a new system.