Naming convention fixes