JC: added uniquess name/short name to model and spec.