Fixes #290. Renamed abstract class