Restore class name, rename interface