REP-28: Moved name of UUID field.