The renaming makes sense, but I'd think there should be an equivalent renaming for the header file as well.