yet another stupid class name changes