Removing last usages of 'Doctrine' in class names

Hotfix for #100