Index: /trunk/src/VBox/Main/include/VirtualBoxImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/VirtualBoxImpl.h	(revision 85303)
+++ /trunk/src/VBox/Main/include/VirtualBoxImpl.h	(revision 85304)
@@ -167,16 +167,16 @@
     void i_onStorageControllerChanged(const Guid &aMachineId, const com::Utf8Str &aControllerName);
     void i_onStorageDeviceChanged(IMediumAttachment* aStorageDevice, const BOOL fRemoved, const BOOL fSilent);
-    void i_onMachineStateChange(const Guid &aId, MachineState_T aState);
-    void i_onMachineDataChange(const Guid &aId, BOOL aTemporary = FALSE);
+    void i_onMachineStateChanged(const Guid &aId, MachineState_T aState);
+    void i_onMachineDataChanged(const Guid &aId, BOOL aTemporary = FALSE);
     BOOL i_onExtraDataCanChange(const Guid &aId, IN_BSTR aKey, IN_BSTR aValue,
                                 Bstr &aError);
-    void i_onExtraDataChange(const Guid &aId, IN_BSTR aKey, IN_BSTR aValue);
+    void i_onExtraDataChanged(const Guid &aId, IN_BSTR aKey, IN_BSTR aValue);
     void i_onMachineRegistered(const Guid &aId, BOOL aRegistered);
-    void i_onSessionStateChange(const Guid &aId, SessionState_T aState);
+    void i_onSessionStateChanged(const Guid &aId, SessionState_T aState);
 
     void i_onSnapshotTaken(const Guid &aMachineId, const Guid &aSnapshotId);
     void i_onSnapshotDeleted(const Guid &aMachineId, const Guid &aSnapshotId);
     void i_onSnapshotRestored(const Guid &aMachineId, const Guid &aSnapshotId);
-    void i_onSnapshotChange(const Guid &aMachineId, const Guid &aSnapshotId);
+    void i_onSnapshotChanged(const Guid &aMachineId, const Guid &aSnapshotId);
 
 #ifdef VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS
@@ -192,10 +192,9 @@
 #endif /* VBOX_WITH_SHARED_CLIPBOARD_TRANSFERS */
 
-    void i_onGuestPropertyChange(const Guid &aMachineId, IN_BSTR aName, IN_BSTR aValue,
-                                 IN_BSTR aFlags);
-    void i_onNatRedirectChange(const Guid &aMachineId, ULONG ulSlot, bool fRemove, IN_BSTR aName,
-                                     NATProtocol_T aProto, IN_BSTR aHostIp, uint16_t aHostPort,
-                                     IN_BSTR aGuestIp, uint16_t aGuestPort);
-    void i_onNATNetworkChange(IN_BSTR aNetworkName);
+    void i_onGuestPropertyChanged(const Guid &aMachineId, IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags);
+    void i_onNatRedirectChanged(const Guid &aMachineId, ULONG ulSlot, bool fRemove, IN_BSTR aName,
+                                NATProtocol_T aProto, IN_BSTR aHostIp, uint16_t aHostPort,
+                                IN_BSTR aGuestIp, uint16_t aGuestPort);
+    void i_onNATNetworkChanged(IN_BSTR aNetworkName);
     void i_onNATNetworkStartStop(IN_BSTR aNetworkName, BOOL aStart);
     void i_onNATNetworkSetting(IN_BSTR aNetworkName, BOOL aEnabled, IN_BSTR aNetwork,
Index: /trunk/src/VBox/Main/src-server/MachineImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/MachineImpl.cpp	(revision 85303)
+++ /trunk/src/VBox/Main/src-server/MachineImpl.cpp	(revision 85304)
@@ -952,6 +952,6 @@
             /* make sure interesting parties will notice the accessibility
              * state change */
-            mParent->i_onMachineStateChange(mData->mUuid, mData->mMachineState);
-            mParent->i_onMachineDataChange(mData->mUuid);
+            mParent->i_onMachineStateChanged(mData->mUuid, mData->mMachineState);
+            mParent->i_onMachineDataChanged(mData->mUuid);
         }
     }
@@ -3242,5 +3242,5 @@
         if (oldState != SessionState_Locked)
             /* fire an event */
-            mParent->i_onSessionStateChange(i_getId(), SessionState_Locked);
+            mParent->i_onSessionStateChanged(i_getId(), SessionState_Locked);
     }
 
@@ -3339,5 +3339,5 @@
 
                 /* fire an event */
-                mParent->i_onSessionStateChange(i_getId(), SessionState_Spawning);
+                mParent->i_onSessionStateChanged(i_getId(), SessionState_Spawning);
             }
         }
@@ -4739,5 +4739,5 @@
     // fire notification outside the lock
     if (fChanged)
-        mParent->i_onExtraDataChange(mData->mUuid, Bstr(aKey).raw(), Bstr(aValue).raw());
+        mParent->i_onExtraDataChanged(mData->mUuid, Bstr(aKey).raw(), Bstr(aValue).raw());
 
     return S_OK;
@@ -5523,8 +5523,5 @@
             alock.release();
 
-            mParent->i_onGuestPropertyChange(mData->mUuid,
-                                             Bstr(aName).raw(),
-                                             Bstr(aValue).raw(),
-                                             Bstr(aFlags).raw());
+            mParent->i_onGuestPropertyChanged(mData->mUuid, Bstr(aName).raw(), Bstr(aValue).raw(), Bstr(aFlags).raw());
         }
     }
@@ -7779,5 +7776,5 @@
         mData->mSession.mPID = NIL_RTPROCESS;
 
-        mParent->i_onSessionStateChange(mData->mUuid, SessionState_Unlocked);
+        mParent->i_onSessionStateChanged(mData->mUuid, SessionState_Unlocked);
         return true;
     }
@@ -8384,5 +8381,5 @@
         VBOXAPI_MACHINE_STATE_CHANGED(this, aMachineState, enmOldState, mData->mUuid.toStringCurly().c_str());
 #endif
-        mParent->i_onMachineStateChange(mData->mUuid, aMachineState);
+        mParent->i_onMachineStateChanged(mData->mUuid, aMachineState);
     }
 
@@ -9851,5 +9848,5 @@
          * inform callbacks. */
         if (i_isSessionMachine())
-            mParent->i_onMachineDataChange(mData->mUuid);
+            mParent->i_onMachineDataChanged(mData->mUuid);
     }
 
@@ -12677,5 +12674,5 @@
 
     /* fire an event */
-    mParent->i_onSessionStateChange(mData->mUuid, SessionState_Unlocked);
+    mParent->i_onSessionStateChanged(mData->mUuid, SessionState_Unlocked);
 
     uninitDataAndChildObjects();
@@ -13539,8 +13536,5 @@
         alock.release();
 
-        mParent->i_onGuestPropertyChange(mData->mUuid,
-                                         Bstr(aName).raw(),
-                                         Bstr(aValue).raw(),
-                                         Bstr(aFlags).raw());
+        mParent->i_onGuestPropertyChanged(mData->mUuid, Bstr(aName).raw(), Bstr(aValue).raw(), Bstr(aFlags).raw());
     }
     catch (...)
@@ -13884,6 +13878,6 @@
      */
 
-    mParent->i_onNatRedirectChange(i_getId(), ulSlot, RT_BOOL(aNatRuleRemove), aRuleName, aProto, aHostIp,
-                                   (uint16_t)aHostPort, aGuestIp, (uint16_t)aGuestPort);
+    mParent->i_onNatRedirectChanged(i_getId(), ulSlot, RT_BOOL(aNatRuleRemove), aRuleName, aProto, aHostIp,
+                                    (uint16_t)aHostPort, aGuestIp, (uint16_t)aGuestPort);
     return S_OK;
 }
Index: /trunk/src/VBox/Main/src-server/SnapshotImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/SnapshotImpl.cpp	(revision 85303)
+++ /trunk/src/VBox/Main/src-server/SnapshotImpl.cpp	(revision 85304)
@@ -1402,5 +1402,5 @@
 
     /* inform callbacks */
-    mParent->i_onSnapshotChange(uuidMachine, uuidSnapshot);
+    mParent->i_onSnapshotChanged(uuidMachine, uuidSnapshot);
 
     return rc;
Index: /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp	(revision 85303)
+++ /trunk/src/VBox/Main/src-server/VirtualBoxImpl.cpp	(revision 85304)
@@ -2550,5 +2550,5 @@
     // fire notification outside the lock
     if (fChanged)
-        i_onExtraDataChange(Guid::Empty, Bstr(aKey).raw(), Bstr(aValue).raw());
+        i_onExtraDataChanged(Guid::Empty, Bstr(aKey).raw(), Bstr(aValue).raw());
 
     return rc;
@@ -3290,5 +3290,5 @@
  *  @note Doesn't lock any object.
  */
-void VirtualBox::i_onMachineStateChange(const Guid &aId, MachineState_T aState)
+void VirtualBox::i_onMachineStateChanged(const Guid &aId, MachineState_T aState)
 {
     ComPtr<IEvent> ptrEvent;
@@ -3301,5 +3301,5 @@
  *  @note Doesn't lock any object.
  */
-void VirtualBox::i_onMachineDataChange(const Guid &aId, BOOL aTemporary)
+void VirtualBox::i_onMachineDataChanged(const Guid &aId, BOOL aTemporary)
 {
     ComPtr<IEvent> ptrEvent;
@@ -3352,7 +3352,6 @@
 /**
  *  @note Doesn't lock any object.
- *  @todo +d
- */
-void VirtualBox::i_onExtraDataChange(const Guid &aId, IN_BSTR aKey, IN_BSTR aValue)
+ */
+void VirtualBox::i_onExtraDataChanged(const Guid &aId, IN_BSTR aKey, IN_BSTR aValue)
 {
     ComPtr<IEvent> ptrEvent;
@@ -3375,7 +3374,6 @@
 /**
  *  @note Doesn't lock any object.
- *  @todo +d
- */
-void VirtualBox::i_onSessionStateChange(const Guid &aId, SessionState_T aState)
+ */
+void VirtualBox::i_onSessionStateChanged(const Guid &aId, SessionState_T aState)
 {
     ComPtr<IEvent> ptrEvent;
@@ -3423,7 +3421,6 @@
 /**
  *  @note Doesn't lock any object.
- *  @todo +d
- */
-void VirtualBox::i_onSnapshotChange(const Guid &aMachineId, const Guid &aSnapshotId)
+ */
+void VirtualBox::i_onSnapshotChanged(const Guid &aMachineId, const Guid &aSnapshotId)
 {
     ComPtr<IEvent> ptrEvent;
@@ -3713,8 +3710,6 @@
 /**
  *  @note Doesn't lock any object.
- *  @todo +d
- */
-void VirtualBox::i_onGuestPropertyChange(const Guid &aMachineId, IN_BSTR aName,
-                                         IN_BSTR aValue, IN_BSTR aFlags)
+ */
+void VirtualBox::i_onGuestPropertyChanged(const Guid &aMachineId, IN_BSTR aName, IN_BSTR aValue, IN_BSTR aFlags)
 {
     ComPtr<IEvent> ptrEvent;
@@ -3727,9 +3722,8 @@
 /**
  *  @note Doesn't lock any object.
- *  @todo +d
- */
-void VirtualBox::i_onNatRedirectChange(const Guid &aMachineId, ULONG ulSlot, bool fRemove, IN_BSTR aName,
-                                       NATProtocol_T aProto, IN_BSTR aHostIp, uint16_t aHostPort,
-                                       IN_BSTR aGuestIp, uint16_t aGuestPort)
+ */
+void VirtualBox::i_onNatRedirectChanged(const Guid &aMachineId, ULONG ulSlot, bool fRemove, IN_BSTR aName,
+                                        NATProtocol_T aProto, IN_BSTR aHostIp, uint16_t aHostPort,
+                                        IN_BSTR aGuestIp, uint16_t aGuestPort)
 {
     ::FireNATRedirectEvent(m->pEventSource, aMachineId.toUtf16().raw(), ulSlot, fRemove, aName, aProto, aHostIp,
@@ -3737,6 +3731,6 @@
 }
 
-/** @todo +d  */
-void VirtualBox::i_onNATNetworkChange(IN_BSTR aName)
+/** @todo Unused!!  */
+void VirtualBox::i_onNATNetworkChanged(IN_BSTR aName)
 {
     ::FireNATNetworkChangedEvent(m->pEventSource, aName);