Even more threadsafe class name disambiguation