Start converting stuff for the updated ffi tools
Make the rename clearer.