diff --git a/FocuserTestConsole/Program.cs b/FocuserTestConsole/Program.cs
index cfafd57..d7cfce5 100644
--- a/FocuserTestConsole/Program.cs
+++ b/FocuserTestConsole/Program.cs
@@ -12,7 +12,7 @@ using System;
 using System.Threading;
 using ASCOM.DriverAccess;
 
-namespace ASCOM
+namespace ASCOM.MeadeGeneric
 {
     class Program
     {
diff --git a/Meade.net.Telescope/Telescope.cs b/Meade.net.Telescope/Telescope.cs
index 264dacb..0ce3b53 100644
--- a/Meade.net.Telescope/Telescope.cs
+++ b/Meade.net.Telescope/Telescope.cs
@@ -349,7 +349,7 @@ namespace ASCOM.Meade.net
         private bool FirmwareIsGreaterThan(string minVersion)
         {
             var currentVersion = _sharedResourcesWrapper.FirmwareVersion;
-            var comparison = currentVersion.CompareTo(minVersion);
+            var comparison = String.Compare(currentVersion, minVersion, StringComparison.Ordinal);
             return (comparison >= 0);
         }
 
diff --git a/Meade.net/ClassFactory.cs b/Meade.net/ClassFactory.cs
index 4b7feca..431e2d0 100644
--- a/Meade.net/ClassFactory.cs
+++ b/Meade.net/ClassFactory.cs
@@ -33,8 +33,8 @@ namespace ASCOM.Meade.net
         #region Access to ole32.dll functions for class factories
 
         // Define two common GUID objects for public usage.
-        private static Guid _iidIUnknown = new Guid("{00000000-0000-0000-C000-000000000046}");
-        private static Guid _iidIDispatch = new Guid("{00020400-0000-0000-C000-000000000046}");
+        private static readonly Guid _iidIUnknown = new Guid("{00000000-0000-0000-C000-000000000046}");
+        private static readonly Guid _iidIDispatch = new Guid("{00020400-0000-0000-C000-000000000046}");
 
         [Flags]
         enum Clsctx : uint
@@ -136,7 +136,7 @@ namespace ASCOM.Meade.net
         #endregion
 
         #region Common ClassFactory Methods
-        public uint ClassContext { get; set; }
+        public uint ClassContext { get; }
 
         public Guid ClassId
         {
@@ -144,7 +144,7 @@ namespace ASCOM.Meade.net
             set => _mClassId = value;
         }
 
-        public uint Flags { get; set; }
+        public uint Flags { get; }
 
         public bool RegisterClassObject()
         {
diff --git a/Meade.net/Localization/LocalisationHelper.cs b/Meade.net/Localization/LocalisationHelper.cs
index 9c4b4bf..d193826 100644
--- a/Meade.net/Localization/LocalisationHelper.cs
+++ b/Meade.net/Localization/LocalisationHelper.cs
@@ -8,7 +8,7 @@ namespace ASCOM.Meade.net.Localization
     internal class LocalisationHelper
     {
         private const string LocalizationNamespace = "LocalisationTest.Localization.Resources.Localization";
-        ResourceManager _resourceManager;
+        private readonly ResourceManager _resourceManager;
 
         public LocalisationHelper()
         {
diff --git a/Meade.net/SharedResources.cs b/Meade.net/SharedResources.cs
index 5598146..9068cf3 100644
--- a/Meade.net/SharedResources.cs
+++ b/Meade.net/SharedResources.cs
@@ -244,7 +244,7 @@ namespace ASCOM.Meade.net
         /// The Key is the connection number that identifies the device, it could be the COM port name,
         /// USB ID or IP Address, the Value is the DeviceHardware class
         /// </summary>
-        private static Dictionary<string, DeviceHardware> _connectedDevices = new Dictionary<string, DeviceHardware>();
+        private static readonly Dictionary<string, DeviceHardware> _connectedDevices = new Dictionary<string, DeviceHardware>();
 
         /// <summary>
         /// This is called in the driver Connect(true) property,
diff --git a/TelescopeTestConsole/Program.cs b/TelescopeTestConsole/Program.cs
index 36d0d4a..f9cc60b 100644
--- a/TelescopeTestConsole/Program.cs
+++ b/TelescopeTestConsole/Program.cs
@@ -10,7 +10,7 @@
 
 using System;
 
-namespace ASCOM
+namespace ASCOM.Meade.net
 {
     class Program
     {