small changes due to refactoring of class names / namespaces