dccp ccid-3: Remove CCID naming redundancy 2/2