Updated to use _Unified class names
Added '_U' extension to unified drivers
Merge remote-tracking branch 'upstream/master'