fix class name resolution