No functional changes, just some model element renames