Another round of further systematization of names in RascalPrimitives