Upgrade find and replace to remove deprecation