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