Changing all instances of userName to username