Index: /trunk/src/VBox/Main/include/RecordingScreenSettingsImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/RecordingScreenSettingsImpl.h	(revision 78067)
+++ /trunk/src/VBox/Main/include/RecordingScreenSettingsImpl.h	(revision 78068)
@@ -44,17 +44,8 @@
 
     // public initializer/uninitializer for internal purposes only
-    HRESULT init(RecordingSettings *aParent, uint32_t uScreenId, const settings::RecordingScreenSettings& data);
-    HRESULT init(RecordingSettings *aParent, RecordingScreenSettings *that);
-    HRESULT initCopy(RecordingSettings *aParent, RecordingScreenSettings *that);
+    HRESULT init(RecordingSettings *aParent, uint32_t uScreenId, const settings::RecordingScreenSettings& aThat);
+    HRESULT init(RecordingSettings *aParent, RecordingScreenSettings *aThat);
+    HRESULT initCopy(RecordingSettings *aParent, RecordingScreenSettings *aThat);
     void uninit();
-
-    // public methods only for internal purposes
-    HRESULT i_loadSettings(const settings::RecordingScreenSettings &data);
-    HRESULT i_saveSettings(settings::RecordingScreenSettings &data);
-
-    void i_rollback();
-    void i_commit();
-    void i_copyFrom(RecordingScreenSettings *aThat);
-    void i_applyDefaults();
 
 private:
Index: /trunk/src/VBox/Main/include/RecordingSettingsImpl.h
===================================================================
--- /trunk/src/VBox/Main/include/RecordingSettingsImpl.h	(revision 78067)
+++ /trunk/src/VBox/Main/include/RecordingSettingsImpl.h	(revision 78068)
@@ -44,6 +44,6 @@
     // public initializer/uninitializer for internal purposes only
     HRESULT init(Machine *parent);
-    HRESULT init(Machine *parent, RecordingSettings *that);
-    HRESULT initCopy(Machine *parent, RecordingSettings *that);
+    HRESULT init(Machine *parent, RecordingSettings *aThat);
+    HRESULT initCopy(Machine *parent, RecordingSettings *aThat);
     void uninit();
 
Index: /trunk/src/VBox/Main/src-server/RecordingScreenSettingsImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/RecordingScreenSettingsImpl.cpp	(revision 78067)
+++ /trunk/src/VBox/Main/src-server/RecordingScreenSettingsImpl.cpp	(revision 78068)
@@ -72,9 +72,10 @@
 
 /**
- * Initializes the audio adapter object.
+ * Initializes the recording screen settings object.
  *
  * @returns COM result indicator
  */
-HRESULT RecordingScreenSettings::init(RecordingSettings *aParent, uint32_t uScreenId, const settings::RecordingScreenSettings& data)
+HRESULT RecordingScreenSettings::init(RecordingSettings *aParent, uint32_t uScreenId,
+                                      const settings::RecordingScreenSettings& aThat)
 {
     LogFlowThisFuncEnter();
@@ -96,5 +97,5 @@
     m->uScreenId = uScreenId;
     m->bd.allocate();
-    m->bd->operator=(data);
+    m->bd->operator=(aThat);
 
     HRESULT rc = S_OK;
@@ -123,10 +124,10 @@
  *  it shares data with is destroyed.
  */
-HRESULT RecordingScreenSettings::init(RecordingSettings *aParent, RecordingScreenSettings *that)
+HRESULT RecordingScreenSettings::init(RecordingSettings *aParent, RecordingScreenSettings *aThat)
 {
     LogFlowThisFuncEnter();
-    LogFlowThisFunc(("aParent: %p, that: %p\n", aParent, that));
-
-    ComAssertRet(aParent && that, E_INVALIDARG);
+    LogFlowThisFunc(("aParent: %p, aThat: %p\n", aParent, aThat));
+
+    ComAssertRet(aParent && aThat, E_INVALIDARG);
 
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -137,10 +138,10 @@
 
     unconst(m->pParent) = aParent;
-    m->pPeer = that;
-
-    AutoWriteLock thatlock(that COMMA_LOCKVAL_SRC_POS);
-
-    m->uScreenId = that->m->uScreenId;
-    m->bd.share(that->m->bd);
+    m->pPeer = aThat;
+
+    AutoWriteLock thatlock(aThat COMMA_LOCKVAL_SRC_POS);
+
+    m->uScreenId = aThat->m->uScreenId;
+    m->bd.share(aThat->m->bd);
 
     HRESULT rc = S_OK;
@@ -166,10 +167,10 @@
  *  of the original object passed as an argument.
  */
-HRESULT RecordingScreenSettings::initCopy(RecordingSettings *aParent, RecordingScreenSettings *that)
+HRESULT RecordingScreenSettings::initCopy(RecordingSettings *aParent, RecordingScreenSettings *aThat)
 {
     LogFlowThisFuncEnter();
-    LogFlowThisFunc(("aParent: %p, that: %p\n", aParent, that));
-
-    ComAssertRet(aParent && that, E_INVALIDARG);
+    LogFlowThisFunc(("aParent: %p, aThat: %p\n", aParent, aThat));
+
+    ComAssertRet(aParent && aThat, E_INVALIDARG);
 
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -182,8 +183,8 @@
     /* mPeer is left null. */
 
-    AutoWriteLock thatlock(that COMMA_LOCKVAL_SRC_POS);
-
-    m->uScreenId = that->m->uScreenId;
-    m->bd.attachCopy(that->m->bd);
+    AutoWriteLock thatlock(aThat COMMA_LOCKVAL_SRC_POS);
+
+    m->uScreenId = aThat->m->uScreenId;
+    m->bd.attachCopy(aThat->m->bd);
 
     HRESULT rc = S_OK;
Index: /trunk/src/VBox/Main/src-server/RecordingSettingsImpl.cpp
===================================================================
--- /trunk/src/VBox/Main/src-server/RecordingSettingsImpl.cpp	(revision 78067)
+++ /trunk/src/VBox/Main/src-server/RecordingSettingsImpl.cpp	(revision 78068)
@@ -65,5 +65,5 @@
 
 /**
- * Initializes the audio adapter object.
+ * Initializes the recording settings object.
  *
  * @returns COM result indicator
@@ -101,10 +101,10 @@
  *  it shares data with is destroyed.
  */
-HRESULT RecordingSettings::init(Machine *aParent, RecordingSettings *that)
-{
-    LogFlowThisFuncEnter();
-    LogFlowThisFunc(("aParent: %p, that: %p\n", aParent, that));
-
-    ComAssertRet(aParent && that, E_INVALIDARG);
+HRESULT RecordingSettings::init(Machine *aParent, RecordingSettings *aThat)
+{
+    LogFlowThisFuncEnter();
+    LogFlowThisFunc(("aParent: %p, aThat: %p\n", aParent, aThat));
+
+    ComAssertRet(aParent && aThat, E_INVALIDARG);
 
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -115,10 +115,10 @@
 
     unconst(m->pMachine) = aParent;
-    m->pPeer = that;
-
-    AutoWriteLock thatlock(that COMMA_LOCKVAL_SRC_POS);
-
-    m->bd.share(that->m->bd);
-    m->mapScreenObj = that->m->mapScreenObj;
+    m->pPeer = aThat;
+
+    AutoWriteLock thatlock(aThat COMMA_LOCKVAL_SRC_POS);
+
+    m->bd.share(aThat->m->bd);
+    m->mapScreenObj = aThat->m->mapScreenObj;
 
     autoInitSpan.setSucceeded();
@@ -133,10 +133,10 @@
  *  of the original object passed as an argument.
  */
-HRESULT RecordingSettings::initCopy(Machine *aParent, RecordingSettings *that)
-{
-    LogFlowThisFuncEnter();
-    LogFlowThisFunc(("aParent: %p, that: %p\n", aParent, that));
-
-    ComAssertRet(aParent && that, E_INVALIDARG);
+HRESULT RecordingSettings::initCopy(Machine *aParent, RecordingSettings *aThat)
+{
+    LogFlowThisFuncEnter();
+    LogFlowThisFunc(("aParent: %p, aThat: %p\n", aParent, aThat));
+
+    ComAssertRet(aParent && aThat, E_INVALIDARG);
 
     /* Enclose the state transition NotReady->InInit->Ready */
@@ -149,8 +149,8 @@
     // mPeer is left null
 
-    AutoWriteLock thatlock(that COMMA_LOCKVAL_SRC_POS);
-
-    m->bd.attachCopy(that->m->bd);
-    m->mapScreenObj = that->m->mapScreenObj;
+    AutoWriteLock thatlock(aThat COMMA_LOCKVAL_SRC_POS);
+
+    m->bd.attachCopy(aThat->m->bd);
+    m->mapScreenObj = aThat->m->mapScreenObj;
 
     autoInitSpan.setSucceeded();