Fixes #911: Renamed base helper classes

Fixes #911