diff --git a/src/NmeaParser.Shared/Nmea/Gps/GPGST.cs b/src/NmeaParser.Shared/Nmea/Gps/GPGST.cs
index 6f759aa..253622c 100644
--- a/src/NmeaParser.Shared/Nmea/Gps/GPGST.cs
+++ b/src/NmeaParser.Shared/Nmea/Gps/GPGST.cs
@@ -61,6 +61,7 @@ namespace NmeaParser.Nmea.Gps
 		/// <summary>
 		/// RMS value of the pseudorange residuals; includes carrier phase residuals during periods of RTK (float) and RTK (fixed) processing
 		/// </summary>
+		[System.Diagnostics.CodeAnalysis.SuppressMessage("Microsoft.Naming", "CA1704:IdentifiersShouldBeSpelledCorrectly", MessageId = "Rms")]
 		public double Rms { get; private set; }
 
 		/// <summary>
diff --git a/src/NmeaParser.Shared/NmeaFileDevice.cs b/src/NmeaParser.Shared/NmeaFileDevice.cs
index e9c41d1..77195ae 100644
--- a/src/NmeaParser.Shared/NmeaFileDevice.cs
+++ b/src/NmeaParser.Shared/NmeaFileDevice.cs
@@ -66,7 +66,7 @@ namespace NmeaParser
 		/// <summary>
 		/// Gets the name of the nmea file this device is using.
 		/// </summary>
-		public string Filename
+		public string FileName
 		{
 			get { return m_filename; }
 		}
diff --git a/src/SampleApp.WinDesktop/MainWindow.xaml.cs b/src/SampleApp.WinDesktop/MainWindow.xaml.cs
index 603be88..057ebcb 100644
--- a/src/SampleApp.WinDesktop/MainWindow.xaml.cs
+++ b/src/SampleApp.WinDesktop/MainWindow.xaml.cs
@@ -72,7 +72,7 @@ namespace SampleApp.WinDesktop
 			currentDevice.MessageReceived += device_MessageReceived;
 			var _ = currentDevice.OpenAsync();
 			if (device is NmeaParser.NmeaFileDevice)
-				currentDeviceInfo.Text = string.Format("NmeaFileDevice( file={0} )", ((NmeaParser.NmeaFileDevice)device).Filename);
+				currentDeviceInfo.Text = string.Format("NmeaFileDevice( file={0} )", ((NmeaParser.NmeaFileDevice)device).FileName);
 			else if (device is NmeaParser.SerialPortDevice)
 			{
 				currentDeviceInfo.Text = string.Format("SerialPortDevice( port={0}, baud={1} )",
@@ -197,7 +197,6 @@ namespace SampleApp.WinDesktop
 						}
 						if (success)
 						{
-							port.Dispose();
 							return new System.IO.Ports.SerialPort(portName, baud);
 						}
 					}