Fix issues caused by namespace change (blind find/replace)