Rename address columns to successfully generate order