rename CSIDs (again), and add CS3a (sodium) support, seems to be working