Globally change np to cnp if cimported
Fix accidentially changed doc strings
Merge pull request #435 from ahojnnes/cnp

RF: Globally change np to cnp if cimported.