Update class name in Registry and minor fixes