Fixes #915: helper classes renamed again