Adapt file- and classnames

Adapt file- and classnames which were previously changed in commit a689ca83c5e7d228b9e40685040bd073be8cbf9d