Minor naming convention fixes.