rename Wrapped*Key* to Canonicalized*Key*
couple of logging fixes