All the registries should now have reference the the correct classes.