am 1d486fb3: am 02d44fe7: Move key name creation to common path

* commit '1d486fb3eadbc6c27aa33322598003b362a0de8c':
  Move key name creation to common path