No functional changes, just some missing model element renames