Minor naming fixes
Manual merge conflict resolution.