Propagating new cut and count names to Makefile and common.h