diff --git a/NTwain/ITwainOperation.cs b/NTwain/ITwainOperation.cs
index 367ab8e..6eab116 100644
--- a/NTwain/ITwainOperation.cs
+++ b/NTwain/ITwainOperation.cs
@@ -32,16 +32,16 @@ namespace NTwain
 
         /// <summary>
         /// Opens the data source manager. This must be the first method used
-        /// before using other TWAIN functions. Calls to this must be followed by <see cref="CloseManager"/> when done with a TWAIN session.
+        /// before using other TWAIN functions. Calls to this must be followed by <see cref="Close"/> when done with a TWAIN session.
         /// </summary>
         /// <returns></returns>
-        ReturnCode OpenManager();
+        ReturnCode Open();
 
         /// <summary>
         /// Closes the data source manager.
         /// </summary>
         /// <returns></returns>
-        ReturnCode CloseManager();
+        ReturnCode Close();
 
         /// <summary>
         /// Forces the stepping down of an opened source when things gets out of control.
@@ -54,7 +54,7 @@ namespace NTwain
         /// Gets list of sources available in the system.
         /// </summary>
         /// <returns></returns>
-        IList<TwainSource> GetSources();
+        IEnumerable<TwainSource> GetSources();
 
         /// <summary>
         /// Gets the manager status. Only call this at state 2 or higher.
diff --git a/NTwain/Internals/TransferLogic.cs b/NTwain/Internals/TransferLogic.cs
index cb95201..67b8415 100644
--- a/NTwain/Internals/TransferLogic.cs
+++ b/NTwain/Internals/TransferLogic.cs
@@ -70,7 +70,7 @@ namespace NTwain.Internals
                     if (xferGroup == DataGroups.None ||
                         (xferGroup & DataGroups.Image) == DataGroups.Image)
                     {
-                        var mech = session.Source.GetCurrentCap(CapabilityId.ICapXferMech).ConvertToEnum<XferMech>();
+                        var mech = session.Source.CapGetCurrent(CapabilityId.ICapXferMech).ConvertToEnum<XferMech>();
                         switch (mech)
                         {
                             case XferMech.Memory:
@@ -91,7 +91,7 @@ namespace NTwain.Internals
                     }
                     if ((xferGroup & DataGroups.Audio) == DataGroups.Audio)
                     {
-                        var mech = session.Source.GetCurrentCap(CapabilityId.ACapXferMech).ConvertToEnum<XferMech>();
+                        var mech = session.Source.CapGetCurrent(CapabilityId.ACapXferMech).ConvertToEnum<XferMech>();
                         switch (mech)
                         {
                             case XferMech.File:
diff --git a/NTwain/TwainSession.cs b/NTwain/TwainSession.cs
index fbe2992..1bb5e01 100644
--- a/NTwain/TwainSession.cs
+++ b/NTwain/TwainSession.cs
@@ -145,44 +145,6 @@ namespace NTwain
             }
         }
 
-
-        /// <summary>
-        /// Gets list of sources available in the system.
-        /// Only call this at state 2 or higher.
-        /// </summary>
-        /// <param name="session">The session.</param>
-        /// <returns></returns>
-        public IList<TwainSource> GetSources()
-        {
-            List<TwainSource> list = new List<TwainSource>();
-
-            // now enumerate
-            TWIdentity srcId;
-            var rc = DGControl.Identity.GetFirst(out srcId);
-            if (rc == ReturnCode.Success) { list.Add(new TwainSource(this, srcId)); }
-            do
-            {
-                rc = DGControl.Identity.GetNext(out srcId);
-                if (rc == ReturnCode.Success)
-                {
-                    list.Add(new TwainSource(this, srcId));
-                }
-            } while (rc == ReturnCode.Success);
-
-            return list;
-        }
-        /// <summary>
-        /// Gets the manager status. Only call this at state 2 or higher.
-        /// </summary>
-        /// <param name="session">The session.</param>
-        /// <returns></returns>
-        public TWStatus GetStatus()
-        {
-            TWStatus stat;
-            DGControl.Status.GetManager(out stat);
-            return stat;
-        }
-
         #endregion
 
         #region ITwainOperation Members
@@ -238,6 +200,90 @@ namespace NTwain
                 return _dgCustom;
             }
         }
+        /// <summary>
+        /// Opens the data source manager. This must be the first method used
+        /// before using other TWAIN functions. Calls to this must be followed by <see cref="Close"/> when done with a TWAIN session.
+        /// </summary>
+        /// <returns></returns>
+        public ReturnCode Open()
+        {
+            var rc = ReturnCode.Failure;
+            MessageLoop.Instance.Invoke(() =>
+            {
+                Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, "Thread {0}: OpenManager.", Thread.CurrentThread.ManagedThreadId));
+
+                rc = DGControl.Parent.OpenDsm(MessageLoop.Instance.LoopHandle);
+                if (rc == ReturnCode.Success)
+                {
+                    // if twain2 then get memory management functions
+                    if ((_appId.DataFunctionalities & DataFunctionalities.Dsm2) == DataFunctionalities.Dsm2)
+                    {
+                        TWEntryPoint entry;
+                        rc = DGControl.EntryPoint.Get(out entry);
+                        if (rc == ReturnCode.Success)
+                        {
+                            Platform.MemoryManager = entry;
+                            Debug.WriteLine("Using TWAIN2 memory functions.");
+                        }
+                        else
+                        {
+                            Close();
+                        }
+                    }
+                }
+            });
+            return rc;
+        }
+
+        /// <summary>
+        /// Closes the data source manager.
+        /// </summary>
+        /// <returns></returns>
+        public ReturnCode Close()
+        {
+            var rc = ReturnCode.Failure;
+            MessageLoop.Instance.Invoke(() =>
+            {
+                Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, "Thread {0}: CloseManager.", Thread.CurrentThread.ManagedThreadId));
+
+                rc = DGControl.Parent.CloseDsm(MessageLoop.Instance.LoopHandle);
+                if (rc == ReturnCode.Success)
+                {
+                    Platform.MemoryManager = null;
+                }
+            });
+            return rc;
+        }
+
+
+        /// <summary>
+        /// Gets list of sources available in the system.
+        /// Only call this at state 2 or higher.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <returns></returns>
+        public IEnumerable<TwainSource> GetSources()
+        {
+            TWIdentity srcId;
+            var rc = DGControl.Identity.GetFirst(out srcId);
+            while (rc == ReturnCode.Success)
+            {
+                yield return new TwainSource(this, srcId);
+                rc = DGControl.Identity.GetNext(out srcId);
+            }
+        }
+        /// <summary>
+        /// Gets the manager status. Only call this at state 2 or higher.
+        /// </summary>
+        /// <param name="session">The session.</param>
+        /// <returns></returns>
+        public TWStatus GetStatus()
+        {
+            TWStatus stat;
+            DGControl.Status.GetManager(out stat);
+            return stat;
+        }
+
 
         #endregion
 
@@ -282,61 +328,6 @@ namespace NTwain
 
         #region privileged calls that causes state change in TWAIN
 
-        /// <summary>
-        /// Opens the data source manager. This must be the first method used
-        /// before using other TWAIN functions. Calls to this must be followed by <see cref="CloseManager"/> when done with a TWAIN session.
-        /// </summary>
-        /// <returns></returns>
-        public ReturnCode OpenManager()
-        {
-            var rc = ReturnCode.Failure;
-            MessageLoop.Instance.Invoke(() =>
-            {
-                Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, "Thread {0}: OpenManager.", Thread.CurrentThread.ManagedThreadId));
-
-                rc = DGControl.Parent.OpenDsm(MessageLoop.Instance.LoopHandle);
-                if (rc == ReturnCode.Success)
-                {
-                    // if twain2 then get memory management functions
-                    if ((_appId.DataFunctionalities & DataFunctionalities.Dsm2) == DataFunctionalities.Dsm2)
-                    {
-                        TWEntryPoint entry;
-                        rc = DGControl.EntryPoint.Get(out entry);
-                        if (rc == ReturnCode.Success)
-                        {
-                            Platform.MemoryManager = entry;
-                            Debug.WriteLine("Using TWAIN2 memory functions.");
-                        }
-                        else
-                        {
-                            CloseManager();
-                        }
-                    }
-                }
-            });
-            return rc;
-        }
-
-        /// <summary>
-        /// Closes the data source manager.
-        /// </summary>
-        /// <returns></returns>
-        public ReturnCode CloseManager()
-        {
-            var rc = ReturnCode.Failure;
-            MessageLoop.Instance.Invoke(() =>
-            {
-                Debug.WriteLine(string.Format(CultureInfo.InvariantCulture, "Thread {0}: CloseManager.", Thread.CurrentThread.ManagedThreadId));
-
-                rc = DGControl.Parent.CloseDsm(MessageLoop.Instance.LoopHandle);
-                if (rc == ReturnCode.Success)
-                {
-                    Platform.MemoryManager = null;
-                }
-            });
-            return rc;
-        }
-
 
         /// <summary>
         /// Enables the source to start transferring.
@@ -459,13 +450,13 @@ namespace NTwain
                 {
                     ((ITwainSessionInternal)this).DisableSource();
                 }
-                if (targetState < 4)
+                if (targetState < 4 && Source != null)
                 {
                     Source.Close();
                 }
                 if (targetState < 3)
                 {
-                    CloseManager();
+                    Close();
                 }
             });
             EnforceState = origFlag;
diff --git a/NTwain/TwainSource.Caps.cs b/NTwain/TwainSource.Caps.cs
index 6524666..d368f04 100644
--- a/NTwain/TwainSource.Caps.cs
+++ b/NTwain/TwainSource.Caps.cs
@@ -13,7 +13,7 @@ namespace NTwain
         /// </summary>
         /// <param name="capId">The cap identifier.</param>
         /// <returns></returns>
-        public QuerySupport GetCapabilitySupport(CapabilityId capId)
+        public QuerySupport CapQuerySupport(CapabilityId capId)
         {
             QuerySupport retVal = QuerySupport.None;
             using (TWCapability cap = new TWCapability(capId))
@@ -37,7 +37,7 @@ namespace NTwain
         /// </summary>
         /// <param name="capId">The cap id.</param>
         /// <returns></returns>
-        public object GetCurrentCap(CapabilityId capId)
+        public object CapGetCurrent(CapabilityId capId)
         {
             using (TWCapability cap = new TWCapability(capId))
             {
@@ -77,7 +77,7 @@ namespace NTwain
         /// </summary>
         /// <param name="capabilityId">The capability unique identifier.</param>
         /// <returns></returns>
-        public IList<object> GetCapabilityValues(CapabilityId capabilityId)
+        public IList<object> CapGetValues(CapabilityId capabilityId)
         {
             var list = new List<object>();
             using (TWCapability cap = new TWCapability(capabilityId))
@@ -100,9 +100,7 @@ namespace NTwain
         /// <returns></returns>
         public IList<XferMech> CapGetImageXferMech()
         {
-
-
-            return GetCapabilityValues(CapabilityId.ICapXferMech).CastToEnum<XferMech>(true);
+            return CapGetValues(CapabilityId.ICapXferMech).CastToEnum<XferMech>(true);
         }
 
         #endregion
@@ -116,7 +114,7 @@ namespace NTwain
         /// <returns></returns>
         public IList<CompressionType> CapGetCompression()
         {
-            return GetCapabilityValues(CapabilityId.ICapCompression).CastToEnum<CompressionType>(true);
+            return CapGetValues(CapabilityId.ICapCompression).CastToEnum<CompressionType>(true);
         }
 
         /// <summary>
@@ -143,7 +141,7 @@ namespace NTwain
         /// <returns></returns>
         public IList<FileFormat> CapGetImageFileFormat()
         {
-            return GetCapabilityValues(CapabilityId.ICapImageFileFormat).CastToEnum<FileFormat>(true);
+            return CapGetValues(CapabilityId.ICapImageFileFormat).CastToEnum<FileFormat>(true);
         }
 
         /// <summary>
@@ -170,7 +168,7 @@ namespace NTwain
         /// <returns></returns>
         public IList<PixelType> CapGetPixelTypes()
         {
-            return GetCapabilityValues(CapabilityId.ICapPixelType).CastToEnum<PixelType>(true);
+            return CapGetValues(CapabilityId.ICapPixelType).CastToEnum<PixelType>(true);
         }
 
         /// <summary>
@@ -200,7 +198,7 @@ namespace NTwain
         /// <returns></returns>
         public IList<XferMech> CapGetImageXferMechs()
         {
-            return GetCapabilityValues(CapabilityId.ICapXferMech).CastToEnum<XferMech>(true);
+            return CapGetValues(CapabilityId.ICapXferMech).CastToEnum<XferMech>(true);
         }
 
         /// <summary>
@@ -210,7 +208,7 @@ namespace NTwain
         /// <returns></returns>
         public IList<XferMech> CapGetAudioXferMechs()
         {
-            return GetCapabilityValues(CapabilityId.ACapXferMech).CastToEnum<XferMech>(true);
+            return CapGetValues(CapabilityId.ACapXferMech).CastToEnum<XferMech>(true);
         }
 
         /// <summary>
@@ -256,7 +254,7 @@ namespace NTwain
         /// <returns></returns>
         public IList<TWFix32> CapGetDPIs()
         {
-            var list = GetCapabilityValues(CapabilityId.ICapXResolution);
+            var list = CapGetValues(CapabilityId.ICapXResolution);
             return list.Select(o => o.ConvertToFix32()).ToList();
         }
 
@@ -308,7 +306,7 @@ namespace NTwain
         /// <returns></returns>
         public IList<SupportedSize> CapGetSupportedSizes()
         {
-            return GetCapabilityValues(CapabilityId.ICapSupportedSizes).CastToEnum<SupportedSize>(true);
+            return CapGetValues(CapabilityId.ICapSupportedSizes).CastToEnum<SupportedSize>(true);
         }
 
         /// <summary>
diff --git a/NTwain/TwainSource.cs b/NTwain/TwainSource.cs
index 34140f6..6c35a66 100644
--- a/NTwain/TwainSource.cs
+++ b/NTwain/TwainSource.cs
@@ -11,6 +11,9 @@ using System.Threading;
 
 namespace NTwain
 {
+    /// <summary>
+    /// Represents a TWAIN data source.
+    /// </summary>
     public partial class TwainSource : INotifyPropertyChanged
     {
         ITwainSessionInternal _session;
@@ -82,6 +85,8 @@ namespace NTwain
             return stat;
         }
 
+        #region properties
+
         internal TWIdentity Identity { get; private set; }
 
         /// <summary>
@@ -156,7 +161,7 @@ namespace NTwain
             {
                 if (_supportedCaps == null && _session.State > 3)
                 {
-                    _supportedCaps = GetCapabilityValues(CapabilityId.CapSupportedCaps).CastToEnum<CapabilityId>(false);
+                    _supportedCaps = CapGetValues(CapabilityId.CapSupportedCaps).CastToEnum<CapabilityId>(false);
                 }
                 return _supportedCaps ?? _emptyCapList;
             }
@@ -167,6 +172,8 @@ namespace NTwain
             }
         }
 
+        #endregion
+
         #region INotifyPropertyChanged Members
 
         /// <summary>
diff --git a/Tests/Tester.Console/Program.cs b/Tests/Tester.Console/Program.cs
index 777360f..175e31c 100644
--- a/Tests/Tester.Console/Program.cs
+++ b/Tests/Tester.Console/Program.cs
@@ -38,7 +38,7 @@ namespace Tester
             Console.WriteLine("Getting ready to do twain stuff on thread {0}.", Thread.CurrentThread.ManagedThreadId);
             Thread.Sleep(1000);
 
-            var rc = twain.OpenManager();
+            var rc = twain.Open();
 
             if (rc == ReturnCode.Success)
             {
@@ -46,7 +46,7 @@ namespace Tester
                 if (hit == null)
                 {
                     Console.WriteLine("The sample source \"TWAIN2 FreeImage Software Scanner\" is not installed.");
-                    twain.CloseManager();
+                    twain.Close();
                 }
                 else
                 {
@@ -59,7 +59,7 @@ namespace Tester
                     }
                     else
                     {
-                        twain.CloseManager();
+                        twain.Close();
                     }
                 }
             }
@@ -73,7 +73,7 @@ namespace Tester
         {
             Console.WriteLine("Source disabled on thread {0}.", Thread.CurrentThread.ManagedThreadId);
             var rc = twain.Source.Close();
-            rc = twain.CloseManager();
+            rc = twain.Close();
         }
 
         static void twain_TransferReady(object sender, TransferReadyEventArgs e)
diff --git a/Tests/Tester.WPF/MainWindow.xaml.cs b/Tests/Tester.WPF/MainWindow.xaml.cs
index 946515e..7311dbb 100644
--- a/Tests/Tester.WPF/MainWindow.xaml.cs
+++ b/Tests/Tester.WPF/MainWindow.xaml.cs
@@ -65,7 +65,7 @@ namespace Tester.WPF
         {
             base.OnSourceInitialized(e);
 
-            var rc = _twainVM.OpenManager();
+            var rc = _twainVM.Open();
             if (rc == ReturnCode.Success)
             {
                 SrcList.ItemsSource = _twainVM.GetSources().Select(s => new DSVM { DS = s });
@@ -93,7 +93,7 @@ namespace Tester.WPF
                     var caps = dsId.DS.SupportedCaps.Select(o => new CapVM
                     {
                         Cap = o,
-                        Supports = dsId.DS.GetCapabilitySupport(o)
+                        Supports = dsId.DS.CapQuerySupport(o)
                     }).OrderBy(o => o.Name).ToList();
                     CapList.ItemsSource = caps;
                 }
@@ -114,505 +114,505 @@ namespace Tester.WPF
                 switch (cap)
                 {
                     case CapabilityId.ACapXferMech:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<XferMech>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<XferMech>();
                         break;
                     case CapabilityId.CapAlarms:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<AlarmType>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<AlarmType>();
                         break;
                     case CapabilityId.CapAlarmVolume:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapAuthor:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapAutoFeed:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapAutomaticCapture:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapAutomaticSenseMedium:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapAutoScan:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapBatteryMinutes:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapBatteryPercentage:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapCameraEnabled:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapCameraOrder:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapCameraPreviewUI:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapCameraSide:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<CameraSide>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<CameraSide>();
                         break;
                     case CapabilityId.CapCaption:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapClearBuffers:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<ClearBuffer>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<ClearBuffer>();
                         break;
                     case CapabilityId.CapClearPage:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapCustomDSData:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapCustomInterfaceGuid:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapDeviceEvent:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<DeviceEvent>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<DeviceEvent>();
                         break;
                     case CapabilityId.CapDeviceOnline:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapDeviceTimeDate:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapDoubleFeedDetection:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<DoubleFeedDetection>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<DoubleFeedDetection>();
                         break;
                     case CapabilityId.CapDoubleFeedDetectionLength:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapDoubleFeedDetectionResponse:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<DoubleFeedDetectionResponse>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<DoubleFeedDetectionResponse>();
                         break;
                     case CapabilityId.CapDoubleFeedDetectionSensitivity:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<DoubleFeedDetectionSensitivity>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<DoubleFeedDetectionSensitivity>();
                         break;
                     case CapabilityId.CapDuplex:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<Duplex>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<Duplex>();
                         break;
                     case CapabilityId.CapDuplexEnabled:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapEnableDSUIOnly:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapEndorser:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapExtendedCaps:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapFeederAlignment:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<FeederAlignment>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<FeederAlignment>();
                         break;
                     case CapabilityId.CapFeederEnabled:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapFeederLoaded:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapFeederOrder:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<FeederOrder>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<FeederOrder>();
                         break;
                     case CapabilityId.CapFeederPocket:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<FeederPocket>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<FeederPocket>();
                         break;
                     case CapabilityId.CapFeederPrep:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapFeedPage:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapIndicators:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapIndicatorsMode:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<IndicatorsMode>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<IndicatorsMode>();
                         break;
                     case CapabilityId.CapJobControl:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<JobControl>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<JobControl>();
                         break;
                     case CapabilityId.CapLanguage:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<Language>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<Language>();
                         break;
                     case CapabilityId.CapMaxBatchBuffers:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapMicrEnabled:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapPaperDetectable:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapPaperHandling:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<PaperHandling>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<PaperHandling>();
                         break;
                     case CapabilityId.CapPowerSaveTime:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapPowerSupply:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<PowerSupply>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<PowerSupply>();
                         break;
                     case CapabilityId.CapPrinter:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<Printer>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<Printer>();
                         break;
                     case CapabilityId.CapPrinterCharRotation:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapPrinterEnabled:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapPrinterFontStyle:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<PrinterFontStyle>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<PrinterFontStyle>();
                         break;
                     case CapabilityId.CapPrinterIndex:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapPrinterIndexLeadChar:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapPrinterIndexMaxValue:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapPrinterIndexNumDigits:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapPrinterIndexStep:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapPrinterIndexTrigger:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<PrinterIndexTrigger>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<PrinterIndexTrigger>();
                         break;
                     case CapabilityId.CapPrinterMode:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<PrinterMode>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<PrinterMode>();
                         break;
                     case CapabilityId.CapPrinterString:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapPrinterStringPreview:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapPrinterSuffix:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapPrinterVerticalOffset:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapReacquireAllowed:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapRewindPage:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapSegmented:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<Segmented>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<Segmented>();
                         break;
                     case CapabilityId.CapSerialNumber:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapSupportedCaps:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<CapabilityId>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<CapabilityId>();
                         break;
                     case CapabilityId.CapSupportedCapsSegmentUnique:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapSupportedDATs:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapThumbnailsEnabled:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapTimeBeforeFirstCapture:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapTimeBetweenCaptures:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapTimeDate:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapUIControllable:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CapXferCount:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.CustomBase:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapAutoBright:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapAutoDiscardBlankPages:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapAutomaticBorderDetection:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapAutomaticColorEnabled:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapAutomaticColorNonColorPixelType:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<PixelType>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<PixelType>();
                         break;
                     case CapabilityId.ICapAutomaticCropUsesFrame:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapAutomaticDeskew:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapAutomaticLengthDetection:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapAutomaticRotate:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapAutoSize:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapBarcodeDetectionEnabled:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapBarcodeMaxRetries:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapBarcodeMaxSearchPriorities:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapBarcodeSearchMode:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapBarcodeSearchPriorities:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapBarcodeTimeout:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapBitDepth:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapBitDepthReduction:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<BitDepthReduction>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<BitDepthReduction>();
                         break;
                     case CapabilityId.ICapBitOrder:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<BitOrder>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<BitOrder>();
                         break;
                     case CapabilityId.ICapBitOrderCodes:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapBrightness:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapCCITTKFactor:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapColorManagementEnabled:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapCompression:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<CompressionType>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<CompressionType>();
                         break;
                     case CapabilityId.ICapContrast:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapCustHalftone:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapExposureTime:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapExtImageInfo:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapFeederType:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<FeederType>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<FeederType>();
                         break;
                     case CapabilityId.ICapFilmType:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<FilmType>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<FilmType>();
                         break;
                     case CapabilityId.ICapFilter:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<FilterType>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<FilterType>();
                         break;
                     case CapabilityId.ICapFlashUsed:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapFlashUsed2:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapFlipRotation:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<FlipRotation>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<FlipRotation>();
                         break;
                     case CapabilityId.ICapFrames:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapGamma:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapHalftones:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapHighlight:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapICCProfile:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<IccProfile>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<IccProfile>();
                         break;
                     case CapabilityId.ICapImageDataSet:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapImageFileFormat:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<FileFormat>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<FileFormat>();
                         break;
                     case CapabilityId.ICapImageFilter:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<ImageFilter>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<ImageFilter>();
                         break;
                     case CapabilityId.ICapImageMerge:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<ImageMerge>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<ImageMerge>();
                         break;
                     case CapabilityId.ICapImageMergeHeightThreshold:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapJpegPixelType:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<PixelType>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<PixelType>();
                         break;
                     case CapabilityId.ICapJpegQuality:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<JpegQuality>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<JpegQuality>();
                         break;
                     case CapabilityId.ICapJpegSubsampling:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<JpegSubsampling>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<JpegSubsampling>();
                         break;
                     case CapabilityId.ICapLampState:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapLightPath:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<LightPath>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<LightPath>();
                         break;
                     case CapabilityId.ICapLightSource:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<LightSource>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<LightSource>();
                         break;
                     case CapabilityId.ICapMaxFrames:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapMinimumHeight:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapMinimumWidth:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapMirror:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<Mirror>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<Mirror>();
                         break;
                     case CapabilityId.ICapNoiseFilter:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<NoiseFilter>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<NoiseFilter>();
                         break;
                     case CapabilityId.ICapOrientation:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<OrientationType>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<OrientationType>();
                         break;
                     case CapabilityId.ICapOverScan:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<OverScan>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<OverScan>();
                         break;
                     case CapabilityId.ICapPatchCodeDetectionEnabled:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapPatchCodeMaxRetries:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapPatchCodeMaxSearchPriorities:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<PatchCode>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<PatchCode>();
                         break;
                     case CapabilityId.ICapPatchCodeSearchMode:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapPatchCodeSearchPriorities:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapPatchCodeTimeout:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     // TODO phys size are twfix32
                     case CapabilityId.ICapPhysicalHeight:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapPhysicalWidth:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapPixelFlavor:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<PixelFlavor>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<PixelFlavor>();
                         break;
                     case CapabilityId.ICapPixelFlavorCodes:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapPixelType:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<PixelType>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<PixelType>();
                         break;
                     case CapabilityId.ICapPlanarChunky:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<PlanarChunky>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<PlanarChunky>();
                         break;
                     case CapabilityId.ICapRotation:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<Rotation>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<Rotation>();
                         break;
                     case CapabilityId.ICapShadow:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapSupportedBarcodeTypes:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<BarcodeType>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<BarcodeType>();
                         break;
                     case CapabilityId.ICapSupportedExtImageInfo:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<ExtendedImageInfo>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<ExtendedImageInfo>();
                         break;
                     case CapabilityId.ICapSupportedPatchCodeTypes:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<PatchCode>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<PatchCode>();
                         break;
                     case CapabilityId.ICapSupportedSizes:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<SupportedSize>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<SupportedSize>();
                         break;
                     case CapabilityId.ICapThreshold:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapTiles:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapTimeFill:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapUndefinedImageSize:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapUnits:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<Unit>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<Unit>();
                         break;
                     case CapabilityId.ICapXferMech:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap).CastToEnum<XferMech>();
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap).CastToEnum<XferMech>();
                         break;
                     case CapabilityId.ICapXNativeResolution:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapXResolution:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapXScaling:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapYNativeResolution:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapYResolution:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapYScaling:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     case CapabilityId.ICapZoomFactor:
-                        CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                        CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         break;
                     default:
                         if (cap > CapabilityId.CustomBase)
                         {
-                            CapDetailList.ItemsSource = _twainVM.Source.GetCapabilityValues(cap);
+                            CapDetailList.ItemsSource = _twainVM.Source.CapGetValues(cap);
                         }
                         else
                         {
diff --git a/Tests/Tester.WPF/ViewModels/TwainVM.cs b/Tests/Tester.WPF/ViewModels/TwainVM.cs
index 20526a8..d47bff4 100644
--- a/Tests/Tester.WPF/ViewModels/TwainVM.cs
+++ b/Tests/Tester.WPF/ViewModels/TwainVM.cs
@@ -68,7 +68,7 @@ namespace Tester.WPF
         {
             // set it up to use file xfer
 
-            if (this.Source.GetCurrentCap(CapabilityId.ICapXferMech).ConvertToEnum<XferMech>() == XferMech.File)
+            if (this.Source.CapGetCurrent(CapabilityId.ICapXferMech).ConvertToEnum<XferMech>() == XferMech.File)
             {
                 var formats = this.Source.CapGetImageFileFormat();
                 var wantFormat = formats.Contains(FileFormat.Tiff) ? FileFormat.Tiff : FileFormat.Bmp;
diff --git a/Tests/Tester.Winform/TestForm.cs b/Tests/Tester.Winform/TestForm.cs
index f6c3f92..1637452 100644
--- a/Tests/Tester.Winform/TestForm.cs
+++ b/Tests/Tester.Winform/TestForm.cs
@@ -111,7 +111,7 @@ namespace Tester.Winform
             }
             if (_twain.State == 3)
             {
-                _twain.CloseManager();
+                _twain.Close();
             }
 
             if (_twain.State > 2)
@@ -239,7 +239,7 @@ namespace Tester.Winform
             }
             if (_twain.State < 3)
             {
-                _twain.OpenManager();
+                _twain.Open();
             }
 
             if (_twain.State >= 3)
@@ -294,7 +294,7 @@ namespace Tester.Winform
         {
             var list = _twain.Source.CapGetSupportedSizes();
             comboSize.DataSource = list;
-            var cur = _twain.Source.GetCurrentCap(CapabilityId.ICapSupportedSizes).ConvertToEnum<SupportedSize>();
+            var cur = _twain.Source.CapGetCurrent(CapabilityId.ICapSupportedSizes).ConvertToEnum<SupportedSize>();
             if (list.Contains(cur))
             {
                 comboSize.SelectedItem = cur;
@@ -303,7 +303,7 @@ namespace Tester.Winform
 
         private void LoadDuplex()
         {
-            ckDuplex.Checked = _twain.Source.GetCurrentCap(CapabilityId.CapDuplexEnabled).ConvertToEnum<uint>() != 0;
+            ckDuplex.Checked = _twain.Source.CapGetCurrent(CapabilityId.CapDuplexEnabled).ConvertToEnum<uint>() != 0;
         }
 
         private void LoadDPI()
@@ -311,7 +311,7 @@ namespace Tester.Winform
             // only allow dpi of certain values for those source that lists everything
             var list = _twain.Source.CapGetDPIs().Where(dpi => (dpi % 50) == 0).ToList();
             comboDPI.DataSource = list;
-            var cur = (TWFix32)_twain.Source.GetCurrentCap(CapabilityId.ICapXResolution);
+            var cur = (TWFix32)_twain.Source.CapGetCurrent(CapabilityId.ICapXResolution);
             if (list.Contains(cur))
             {
                 comboDPI.SelectedItem = cur;
@@ -322,7 +322,7 @@ namespace Tester.Winform
         {
             var list = _twain.Source.CapGetPixelTypes();
             comboDepth.DataSource = list;
-            var cur = _twain.Source.GetCurrentCap(CapabilityId.ICapPixelType).ConvertToEnum<PixelType>();
+            var cur = _twain.Source.CapGetCurrent(CapabilityId.ICapPixelType).ConvertToEnum<PixelType>();
             if (list.Contains(cur))
             {
                 comboDepth.SelectedItem = cur;