Improve naming of _C wrapper macros
Oops. Forgot changing the tests
Remove redundant extern declarations
Simplify _C wrappers