Fix for ambiguous class resolution (wrong class name)