Change model name lookup in controller
merge
Merge branch 'cartolari-change_model_name_lookup'