Replace old types into suggested types