diff --git a/evcontroller.c b/evcontroller.c
index 33fb9abc..3c6ecb43 100644
--- a/evcontroller.c
+++ b/evcontroller.c
@@ -674,7 +674,7 @@ pEVControl CreateEVController(pEVDriver pDriv, char *pName, int *iErr)
   memset(pRes, 0, sizeof(EVControl));
 
   /* new Object Descriptor */
-  pRes->pDes = CreateDescriptor("Environment Controller");
+  pRes->pDes = CreateDescriptor("Environment_Controller");
   if (!pRes->pDes) {
     free(pRes);
     return NULL;
@@ -1481,7 +1481,7 @@ int EVControlFactory(SConnection * pCon, SicsInterp * pSics, void *pData,
     }
     strtolower(argv[2]);
     strtolower(argv[3]);
-    if (FindCommandData(pSics, argv[2], "Environment Controller")) {
+    if (FindCommandData(pSics, argv[2], "Environment_Controller")) {
       if (strcmp(argv[1], "replace") == 0) {
         if (!RemoveEVController(pCon, argv[2])) {
           return 0;