Rename user model and file to match table