Fixed annoying naming conventions