And ditto for naming in registry class