cleaning up the naming convention for the FFI types