Rename the .impl property and ensure all files use unwrap as needed