Update naming for RNG datatypes, refs #519, #462