Refactor to match the name class.