Name change refactor

CODE REVIEW EVERYTHING