Yeah, you're right. The reason we're seeing this in the diff is because I changed two methods in the User class: setUserName -> setName and getUserName -> getName

But yes, this should be changed from a String to a User