moving controller_name assignment before model name condition
Merge branch 'anilmaurya-master'