More code clean up and renaming.