[WIP] Refactor how cipher names are computed