more renaming of cipher sets to 1-byte hex id, and update hashname calculation to include them safely