am 86b16e8c: Move key name creation to common path

* commit '86b16e8c0d353af97f0411917789308dba417295':
  Move key name creation to common path