naming convention fixes