The names of the commits seem fine. The ordering doesn't particularly matter, but I'd probably put the fix first.