Initial "Refactoring"

"Refactoring" the names.