Renamed classes with redundant prefixes (CSP::csp*)