[ref_impl_eiffel] [1663] Refactoring of class / feature names in archetype annotations classes.

Revision: 1663
Author: thomas.beale
Log Message: