diff --git a/DDEve/include/DDEve/Factories.h b/DDEve/include/DDEve/Factories.h
index 23ed4dc7e284ec4fd5187c4d7517c35552e2cfd3..95d6b16360e501d1f31f73ced5d18761671eb940 100644
--- a/DDEve/include/DDEve/Factories.h
+++ b/DDEve/include/DDEve/Factories.h
@@ -43,6 +43,6 @@ namespace {
   };
 }
 
-#define DECLARE_VIEW_FACTORY(x) DD4HEP_PLUGINSVC_FACTORY(x,x,DD4hep::View*(DD4hep::Display*, const char*),__LINE__)
+#define DECLARE_VIEW_FACTORY(x) DD4HEP_PLUGINSVC_FACTORY(x,DD4hep_DDEve_##x,DD4hep::View*(DD4hep::Display*, const char*),__LINE__)
 
 #endif // DD4HEP_DDEVE_FACTORIES_H
diff --git a/DDEve/src/MultiView.cpp b/DDEve/src/MultiView.cpp
index d9e2866bf8e6503679dd9c4bd6403c4a9e7dc1c5..2aa59c7c4a606c65bf51406421e3c4cf99437947 100644
--- a/DDEve/src/MultiView.cpp
+++ b/DDEve/src/MultiView.cpp
@@ -72,7 +72,7 @@ View& MultiView::Build(TEveWindow* slot)   {
     v = PluginService::Create<View*>(typ.c_str(),m_eve,cfg.name.c_str());
   }
   else  {
-    v = PluginService::Create<View*>("DD4hep__RhoZProjection",m_eve,(m_name+" - RhoZ View").c_str());
+    v = PluginService::Create<View*>("DD4hep_DDEve_RhoZProjection",m_eve,(m_name+" - RhoZ View").c_str());
   }
   (new_slot = pack->NewSlot())->MakeCurrent();
   _build(m_eve,v,new_slot);
@@ -84,7 +84,7 @@ View& MultiView::Build(TEveWindow* slot)   {
     v = PluginService::Create<View*>(typ.c_str(),m_eve,cfg.name.c_str());
   }
   else  {
-    v = PluginService::Create<View*>("DD4hep__RhoPhiProjection",m_eve,(m_name+" - RPhi View").c_str());
+    v = PluginService::Create<View*>("DD4hep_DDEve_RhoPhiProjection",m_eve,(m_name+" - RPhi View").c_str());
   }
   (new_slot = pack->NewSlot())->MakeCurrent();
   _build(m_eve,v,new_slot);
diff --git a/DDEve/src/ViewMenu.cpp b/DDEve/src/ViewMenu.cpp
index 9b77538dab72a106685a38d55e194866bd830b99..73c0937dd4064f15b97a866bb95bab66e75066b6 100644
--- a/DDEve/src/ViewMenu.cpp
+++ b/DDEve/src/ViewMenu.cpp
@@ -51,13 +51,13 @@ ViewMenu::~ViewMenu()  {
 void ViewMenu::Build(TGMenuBar* bar, int hints)    {
   pair<string,string>* p = 0;
   PopupMenu* view_menu = this;
-  view_menu->AddEntry("3&D View", this, &ViewMenu::CreateView, p=new pair<string,string>("DD4hep__View3D","3D"));
-  view_menu->AddEntry("Rho-&Z Projection", this, &ViewMenu::CreateView, p=new pair<string,string>("DD4hep__RhoZProjection","Rho-Z"));
-  view_menu->AddEntry("Rho-&Phi Projection",this, &ViewMenu::CreateView, p=new pair<string,string>("DD4hep__RhoPhiProjection","Rho-Phi"));
+  view_menu->AddEntry("3&D View", this, &ViewMenu::CreateView, p=new pair<string,string>("DD4hep_DDEve_View3D","3D"));
+  view_menu->AddEntry("Rho-&Z Projection", this, &ViewMenu::CreateView, p=new pair<string,string>("DD4hep_DDEve_RhoZProjection","Rho-Z"));
+  view_menu->AddEntry("Rho-&Phi Projection",this, &ViewMenu::CreateView, p=new pair<string,string>("DD4hep_DDEve_RhoPhiProjection","Rho-Phi"));
   const Display::ViewConfigurations& vc = m_display->viewConfigurations();
   for(Display::ViewConfigurations::const_iterator i=vc.begin(); i!=vc.end(); ++i)  {
     const Display::ViewConfig& v = (*i).second;
-    view_menu->AddEntry(v.name.c_str(), this, &ViewMenu::CreateView,p=new pair<string,string>("DD4hep__"+v.type,v.name));
+    view_menu->AddEntry(v.name.c_str(), this, &ViewMenu::CreateView,p=new pair<string,string>("DD4hep_DDEve_"+v.type,v.name));
   }
   bar->AddPopup(m_title.c_str(),*view_menu, new TGLayoutHints(hints, 0, 4, 0, 0));
 }
@@ -69,7 +69,7 @@ void ViewMenu::CreateView(TGMenuEntry*, void* ud)   {
 }
 
 View* ViewMenu::CreateView(const std::string& type, const std::string& title)   {
-  pair<string,string> args("DD4hep__"+type,title);
+  pair<string,string> args("DD4hep_DDEve_"+type,title);
   View* v = PluginService::Create<View*>(type.c_str(),m_display,title.c_str());
   BuildView(v);
   return v;
@@ -77,17 +77,17 @@ View* ViewMenu::CreateView(const std::string& type, const std::string& title)
 
 /// Create a new 3D view
 View* ViewMenu::CreateView3D(const std::string& title)   {
-  return CreateView("DD4hep__View3D",title.c_str());
+  return CreateView("DD4hep_DDEve_View3D",title.c_str());
 }
 
 /// Create a new R-Z view
 View* ViewMenu::CreateRhoZProjection(const std::string& title )  {
-  return CreateView("DD4hep__RhoZProjection",title.c_str());
+  return CreateView("DD4hep_DDEve_RhoZProjection",title.c_str());
 }
 
 /// Create a new R-Phi view
 View* ViewMenu::CreateRhoPhiProjection(const std::string& title )  {
-  return CreateView("DD4hep__RhoPhiProjection",title.c_str());
+  return CreateView("DD4hep_DDEve_RhoPhiProjection",title.c_str());
 }
 
 /// Import Geometry data