Rename some structs and functinons to make them private.