Merge changes Ic42fc70e,I7317f9c4

* changes:
  Also update algorithm mapping tables for names
  Don't clobber existing entries in the AlgorithmId tables