Finish refactoring name/number functionality

About to refactor specs