Merge pull request #109 from alex/refactor-cipher-names

[WIP] Refactor how cipher names are computed