fix code after class renaming in cascading 2.6 wip