[TASK] Reorder & Rename entries in CType list