Refactor variable names
Rename player name methods