Corrected some serious naming inconsistancies