fixes for director class naming when nested classes are used