Fix class name tupo
Merge branch 'feature/notifications' into new_staging

* feature/notifications:
  Fix class name tupo