Fix renamed struct usages