More changes to enable editions - renaming elements