refactor/controllers
terms fixed
Merge branch 'refactor/controllers' into develop

* refactor/controllers:
  terms fixed
  refactor/controllers