diff --git a/evcontroller.c b/evcontroller.c
index 9baa4071..b1bb0406 100644
--- a/evcontroller.c
+++ b/evcontroller.c
@@ -710,7 +710,7 @@ static void ErrReport(pEVControl self)
    memset(pRes,0,sizeof(EVControl));
    
    /* new Object Descriptor */
-   pRes->pDes = CreateDescriptor("Environment Controller");
+   pRes->pDes = CreateDescriptor("Environment_Controller");
    if(!pRes->pDes)
    {
      free(pRes);
@@ -1573,7 +1573,7 @@ int RemoveEVController(SConnection *pCon, char *name) {
         }
         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;