Improve naming of _C wrapper macros

This will jjust clear up the naming confusion, without making further changes.

This is related to issue #313.