Naming is more consistent with the new scheme. May affect some third party drivers (header file renames).