Renamed and refactored RegisteratedUser => User