Fix Classname and Filename

Replaces #320