There are a number of places where CP/Spanking might fit in - traditionally Fetish but also under a general Kinky-type heading.
Putting under Fetish as Sadism/Masochism doesn't always work as many 'fans' don't see themselves as S&M types?
Maybe a clearer sub-category - either within Fetish or Kinky?