#398 Small comment/naming improvements.

4 jobs for 398-various-checks-for-cif-checker-crash-for-violations-in-the-root-of-the-specification-2 in 0 seconds (queued for 43 seconds)