more crypto renames/refactors (common to digester)