Index: trunk/src/VBox/Main/ConsoleImpl.cpp
===================================================================
--- trunk/src/VBox/Main/ConsoleImpl.cpp	(revision 10305)
+++ trunk/src/VBox/Main/ConsoleImpl.cpp	(revision 10797)
@@ -82,6 +82,6 @@
 
 #include <VBox/HostServices/VBoxClipboardSvc.h>
-#ifdef VBOX_WITH_INFO_SVC
-# include <VBox/HostServices/VBoxInfoSvc.h>
+#ifdef VBOX_WITH_GUEST_PROPS
+# include <VBox/HostServices/GuestPropertySvc.h>
 #endif
 
@@ -3538,5 +3538,5 @@
 HRESULT Console::getGuestProperty (INPTR BSTR aKey, BSTR *aValue)
 {
-#if !defined (VBOX_WITH_INFO_SVC)
+#if !defined (VBOX_WITH_GUEST_PROPS)
     return E_NOTIMPL;
 #else
@@ -3557,9 +3557,9 @@
 
     HRESULT rc = E_UNEXPECTED;
-    using namespace svcInfo;
+    using namespace guestProp;
 
     VBOXHGCMSVCPARM parm[3];
     Utf8Str Utf8Key = aKey;
-    Utf8Str Utf8Value (KEY_MAX_VALUE_LEN);
+    Utf8Str Utf8Value (MAX_VALUE_LEN);
 
     parm[0].type = VBOX_HGCM_SVC_PARM_PTR;
@@ -3570,6 +3570,6 @@
     parm[1].type = VBOX_HGCM_SVC_PARM_PTR;
     parm[1].u.pointer.addr = Utf8Value.mutableRaw();
-    parm[1].u.pointer.size = KEY_MAX_VALUE_LEN;
-    int vrc = mVMMDev->hgcmHostCall ("VBoxSharedInfoSvc", GET_CONFIG_KEY_HOST,
+    parm[1].u.pointer.size = MAX_VALUE_LEN;
+    int vrc = mVMMDev->hgcmHostCall ("VBoxGuestPropSvc", GET_CONFIG_KEY_HOST,
                                      3, &parm[0]);
     /* The returned string should never be able to be greater than our buffer */
@@ -3585,7 +3585,7 @@
     else
         rc = setError (E_UNEXPECTED,
-            tr ("Failed to call the VBoxSharedInfoSvc service (%Rrc)"), vrc);
+            tr ("Failed to call the VBoxGuestPropSvc service (%Rrc)"), vrc);
     return rc;
-#endif /* else !defined (VBOX_WITH_INFO_SVC) */
+#endif /* else !defined (VBOX_WITH_GUEST_PROPS) */
 }
 
@@ -3595,5 +3595,5 @@
 HRESULT Console::setGuestProperty (INPTR BSTR aKey, INPTR BSTR aValue)
 {
-#if !defined (VBOX_WITH_INFO_SVC)
+#if !defined (VBOX_WITH_GUEST_PROPS)
     return E_NOTIMPL;
 #else
@@ -3614,5 +3614,5 @@
 
     HRESULT rc = E_UNEXPECTED;
-    using namespace svcInfo;
+    using namespace guestProp;
 
     VBOXHGCMSVCPARM parm[2];
@@ -3633,9 +3633,9 @@
         /* The + 1 is the null terminator */
         parm[1].u.pointer.size = Utf8Value.length() + 1;
-        vrc = mVMMDev->hgcmHostCall ("VBoxSharedInfoSvc", SET_CONFIG_KEY_HOST,
+        vrc = mVMMDev->hgcmHostCall ("VBoxGuestPropSvc", SET_CONFIG_KEY_HOST,
                                      2, &parm[0]);
     }
     else
-        vrc = mVMMDev->hgcmHostCall ("VBoxSharedInfoSvc", DEL_CONFIG_KEY_HOST,
+        vrc = mVMMDev->hgcmHostCall ("VBoxGuestPropSvc", DEL_CONFIG_KEY_HOST,
                                      1, &parm[0]);
     if (RT_SUCCESS (vrc))
@@ -3643,7 +3643,7 @@
     else
         rc = setError (E_UNEXPECTED,
-            tr ("Failed to call the VBoxSharedInfoSvc service (%Rrc)"), vrc);
+            tr ("Failed to call the VBoxGuestPropSvc service (%Rrc)"), vrc);
     return rc;
-#endif /* else !defined (VBOX_WITH_INFO_SVC) */
+#endif /* else !defined (VBOX_WITH_GUEST_PROPS) */
 }
 
@@ -4171,5 +4171,5 @@
         alock.enter();
     }
-# ifdef VBOX_WITH_INFO_SVC
+# ifdef VBOX_WITH_GUEST_PROPS
     /* Save all guest/host property store entries to the machine XML
      * file as extra data. */
@@ -4179,9 +4179,9 @@
     while (pValue != NULL && RT_SUCCESS(vrc))
     {
-        using namespace svcInfo;
-        char szKeyName[KEY_MAX_LEN];
-        char szKeyValue[KEY_MAX_VALUE_LEN];
-        char szExtraDataName[VBOX_SHARED_INFO_PREFIX_LEN + KEY_MAX_LEN];
-        vrc = CFGMR3GetValueName (pValue, szKeyName, KEY_MAX_LEN);
+        using namespace guestProp;
+        char szKeyName[MAX_NAME_LEN];
+        char szKeyValue[MAX_VALUE_LEN];
+        char szExtraDataName[VBOX_SHARED_INFO_PREFIX_LEN + MAX_NAME_LEN];
+        vrc = CFGMR3GetValueName (pValue, szKeyName, MAX_NAME_LEN);
         if (RT_SUCCESS(vrc))
             vrc = CFGMR3QueryString (pRegistry, szKeyName, szKeyValue, sizeof(szKeyValue));
@@ -4203,5 +4203,5 @@
     for (;;)
     {
-        using namespace svcInfo;
+        using namespace guestProp;
         Bstr strNextExtraDataKey;
         Bstr strExtraDataValue;
@@ -4224,5 +4224,5 @@
 
         /* Now see if a lookup of the name in the CFGM node succeeds. */
-        char szKeyValue[KEY_MAX_VALUE_LEN];
+        char szKeyValue[MAX_VALUE_LEN];
         vrc = CFGMR3QueryString (pRegistry, pszCFGMValueName, szKeyValue, sizeof(szKeyValue));
         /* And delete it from the extra data if it failed. */
@@ -4230,5 +4230,5 @@
             mMachine->SetExtraData(strExtraDataKey, NULL);
     }
-# endif /* VBOX_WITH_INFO_SVC defined */
+# endif /* VBOX_WITH_GUEST_PROPS defined */
 #endif /* VBOX_HGCM */
 
