Updating files to remove hard coded strings