No functional changes, just the usual model element renames
Typo (in a comment) corrected.