Naming convention fixes
Fixed conflict