Replace old prefixes (CRB_) with HK_