This is a global search/replace, the needed manual changes
will be committed separately