Fixes the renaming statements to properly drop HHQ prefixes