improve the hpg plan name shortcuts with even shorter names for the new plans