renaming everything to match production