fixed some AWEFUL naming conventions I did