Renamed class and property

Fixes #66