dccp ccid-3: Overhaul CCID naming convention 2/2