Model renaming

To reflect latest spec wording:
* Variant
* Installation

The Java code has been (finally) updated