Naming convention fixes.