Fixed some more things
Fixed naming conventions
Fixing some more naming conventions
Some more