reorder when we'll be looking up digest instances, and unify on a single format for names (the Java-style)