echosounder: start renaming things in C code