Rolled back the renames and added #[allow(non_camel_case_types)] to ffi.rs

As promised, this reverts any renames to conform to the camel case types compiler warnings.