Take actual model name, rather than namespace/model.
Merge remote-tracking branch 'markprovan/master'