updates to avoid bad hex key names