standardize human-readable preset names to include "HWP" #3307

#3307 

The "Academic" preset should be easily understood as part of the "HWP" suite.