Naming conventions

Also removed a bit of code that is currently useless.