updating internal PDO bits to use global namespace