Refactoring: rename the rid type of rid to short, to avoid ambiguity in nomenclature.

RIDs can be either :short or :uuid.