fixing hard coded user name references