Remove c_equal from C_ classes
Small name refactoring
Improve diffing and validation