Renames remaining objects
Merge branch 'feature/storm-object-rename' into develop

* feature/storm-object-rename:
  Renames remaining objects