Naming conventions fixed