Cleaned-up C2S test.
Renamed some functions and constants, for consistency.