Types moved to files and "EnterUserName" renamed