diff -ur root-5.34.38.orig/etc/plugins/TFile/P090_TSQLFile.C root-5.34.38/etc/plugins/TFile/P090_TSQLFile.C
--- root-5.34.38.orig/etc/plugins/TFile/P090_TSQLFile.C	2018-03-12 15:48:57.000000000 +0100
+++ root-5.34.38/etc/plugins/TFile/P090_TSQLFile.C	2019-07-03 16:40:24.427440579 +0200
@@ -1,7 +1,7 @@
 void P090_TSQLFile()
 {
    gPluginMgr->AddHandler("TFile", "^mysql:", "TSQLFile",
-      "SQL", "TSQLFile(const char*,Option_t*,const char*,const char*)");
+      "SQLIO", "TSQLFile(const char*,Option_t*,const char*,const char*)");
    gPluginMgr->AddHandler("TFile", "^oracle:", "TSQLFile",
-      "SQL", "TSQLFile(const char*,Option_t*,const char*,const char*)");
+      "SQLIO", "TSQLFile(const char*,Option_t*,const char*,const char*)");
 }
diff -ur root-5.34.38.orig/etc/plugins/TFileStager/P010_TXNetFileStager.C root-5.34.38/etc/plugins/TFileStager/P010_TXNetFileStager.C
--- root-5.34.38.orig/etc/plugins/TFileStager/P010_TXNetFileStager.C	2018-03-12 15:48:57.000000000 +0100
+++ root-5.34.38/etc/plugins/TFileStager/P010_TXNetFileStager.C	2019-07-03 16:40:24.428440568 +0200
@@ -2,7 +2,7 @@
 {
    if (!gEnv->GetValue("XNet.UseOldClient", 0)) {
       gPluginMgr->AddHandler("TFileStager", "^[x]?root:", "TNetXNGFileStager",
-         "NetXNG", "TNetXNGFileStager(const char *)");
+         "NetxNG", "TNetXNGFileStager(const char *)");
    } else {
       gPluginMgr->AddHandler("TFileStager", "^[x]?root:", "TXNetFileStager",
          "Netx", "TXNetFileStager(const char *)");
diff -ur root-5.34.38.orig/etc/plugins/TImagePlugin/P010_TASPluginGS.C root-5.34.38/etc/plugins/TImagePlugin/P010_TASPluginGS.C
--- root-5.34.38.orig/etc/plugins/TImagePlugin/P010_TASPluginGS.C	2018-03-12 15:48:57.000000000 +0100
+++ root-5.34.38/etc/plugins/TImagePlugin/P010_TASPluginGS.C	2019-07-03 16:40:41.168263888 +0200
@@ -1,9 +1,9 @@
 void P010_TASPluginGS()
 {
    gPluginMgr->AddHandler("TImagePlugin", "ps", "TASPluginGS",
-      "ASPluginGS", "TASPluginGS(const char*)");
+      "ASImage", "TASPluginGS(const char*)");
    gPluginMgr->AddHandler("TImagePlugin", "eps", "TASPluginGS",
-      "ASPluginGS", "TASPluginGS(const char*)");
+      "ASImage", "TASPluginGS(const char*)");
    gPluginMgr->AddHandler("TImagePlugin", "pdf", "TASPluginGS",
-      "ASPluginGS", "TASPluginGS(const char*)");
+      "ASImage", "TASPluginGS(const char*)");
 }
diff -ur root-5.34.38.orig/etc/plugins/TVirtualGraphPainter/P010_TGraphPainter.C root-5.34.38/etc/plugins/TVirtualGraphPainter/P010_TGraphPainter.C
--- root-5.34.38.orig/etc/plugins/TVirtualGraphPainter/P010_TGraphPainter.C	2018-03-12 15:48:57.000000000 +0100
+++ root-5.34.38/etc/plugins/TVirtualGraphPainter/P010_TGraphPainter.C	2019-07-03 16:40:41.168263888 +0200
@@ -1,5 +1,5 @@
 void P010_TGraphPainter()
 {
    gPluginMgr->AddHandler("TVirtualGraphPainter", "*", "TGraphPainter",
-      "GraphPainter", "TGraphPainter()");
+      "HistPainter", "TGraphPainter()");
 }