Refactoring Step 2 complete: Renaming odd names into smarter ones