Merge "Update Configuration for renaming and fixes"