Fixing renaming, plus light code cleanup.