If you combine multiple classful networks it is supernetting, when you make them smaller you are subnetting .
CIDR is a condition where you no longer consider the classful boundries. You no longer need to think of the words subnetting or supernetting really because everything is a simple division between network and host.