Index: /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp
===================================================================
--- /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp	(revision 38886)
+++ /trunk/src/VBox/Frontends/VBoxManage/VBoxManageStorageController.cpp	(revision 38887)
@@ -818,11 +818,11 @@
                 if (!RTStrICmp(pszDiscard, "on"))
                 {
-                    CHECK_ERROR(machine, DiscardDevice(Bstr(pszCtl).raw(),
-                                                       port, device, TRUE));
+                    CHECK_ERROR(machine, SetAutoDiscardForDevice(Bstr(pszCtl).raw(),
+                                                                 port, device, TRUE));
                 }
                 else if (!RTStrICmp(pszDiscard, "off"))
                 {
-                    CHECK_ERROR(machine, DiscardDevice(Bstr(pszCtl).raw(),
-                                                       port, device, FALSE));
+                    CHECK_ERROR(machine, SetAutoDiscardForDevice(Bstr(pszCtl).raw(),
+                                                                 port, device, FALSE));
                 }
                 else
Index: /trunk/src/VBox/Main/idl/VirtualBox.xidl
===================================================================
--- /trunk/src/VBox/Main/idl/VirtualBox.xidl	(revision 38886)
+++ /trunk/src/VBox/Main/idl/VirtualBox.xidl	(revision 38887)
@@ -4763,5 +4763,5 @@
     </method>
 
-    <method name="discardDevice">
+    <method name="setAutoDiscardForDevice">
       <desc>
         Sets a flag in the device information which indicates that the medium
Index: /trunk/src/VBox/Main/include/MachineImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/MachineImpl.h	(revision 38886)
+++ /trunk/src/VBox/Main/include/MachineImpl.h	(revision 38887)
@@ -479,5 +479,5 @@
     STDMETHOD(TemporaryEjectDevice)(IN_BSTR aControllerName, LONG aControllerPort, LONG aDevice, BOOL aTempEject);
     STDMETHOD(NonRotationalDevice)(IN_BSTR aControllerName, LONG aControllerPort, LONG aDevice, BOOL aNonRotational);
-    STDMETHOD(DiscardDevice)(IN_BSTR aControllerName, LONG aControllerPort, LONG aDevice, BOOL aDiscard);
+    STDMETHOD(SetAutoDiscardForDevice)(IN_BSTR aControllerName, LONG aControllerPort, LONG aDevice, BOOL aDiscard);
     STDMETHOD(SetBandwidthGroupForDevice)(IN_BSTR aControllerName, LONG aControllerPort,
                                           LONG aDevice, IBandwidthGroup *aBandwidthGroup);
Index: /trunk/src/VBox/Main/src-server/MachineImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/MachineImpl.cpp	(revision 38886)
+++ /trunk/src/VBox/Main/src-server/MachineImpl.cpp	(revision 38887)
@@ -4050,6 +4050,6 @@
 }
 
-STDMETHODIMP Machine::DiscardDevice(IN_BSTR aControllerName, LONG aControllerPort,
-                                    LONG aDevice, BOOL aDiscard)
+STDMETHODIMP Machine::SetAutoDiscardForDevice(IN_BSTR aControllerName, LONG aControllerPort,
+                                              LONG aDevice, BOOL aDiscard)
 {
     CheckComArgStrNotEmptyOrNull(aControllerName);