More renames.
Slightly confused renames
More refactorings.
New minor refactorings.
More refactoring.
More renamings
Finished renaming for mkobj.cc
More refactorings.