Massive search and replace for a few of the functions that have already been converted to PDO #164