adjust naming from latest crypto