Change some names
Add HQC