Zh adds annotation and rename to InterfaceToClass