diff --git a/LibationWinForms/BookLiberation/AudioConvertForm.cs b/LibationWinForms/BookLiberation/AudioConvertForm.cs
index 66c1c0c9..7c5c9e9d 100644
--- a/LibationWinForms/BookLiberation/AudioConvertForm.cs
+++ b/LibationWinForms/BookLiberation/AudioConvertForm.cs
@@ -16,7 +16,7 @@ namespace LibationWinForms.BookLiberation
 		public override string DecodeActionName => "Converting";
 		#endregion
 
-		#region IProcessable event handler overrides
+		#region Processable event handler overrides
 		public override void Processable_Begin(object sender, LibraryBook libraryBook)
 		{
 			LogMe.Info($"Convert Step, Begin: {libraryBook.Book}");
diff --git a/LibationWinForms/BookLiberation/AudioDecodeForm.cs b/LibationWinForms/BookLiberation/AudioDecodeForm.cs
index af9273f5..3890eb01 100644
--- a/LibationWinForms/BookLiberation/AudioDecodeForm.cs
+++ b/LibationWinForms/BookLiberation/AudioDecodeForm.cs
@@ -18,7 +18,7 @@ namespace LibationWinForms.BookLiberation
 		private string authorNames;
 		private string narratorNames;
 
-		#region IProcessable event handler overrides
+		#region Processable event handler overrides
 		public override void Processable_Begin(object sender, LibraryBook libraryBook)
 		{
 			base.Processable_Begin(sender, libraryBook);
@@ -40,7 +40,7 @@ namespace LibationWinForms.BookLiberation
 		}
 		#endregion
 
-		#region IStreamable event handler overrides
+		#region Streamable event handler overrides
 		public override void Streamable_StreamingProgressChanged(object sender, DownloadProgress downloadProgress)
 		{
 			base.Streamable_StreamingProgressChanged(sender, downloadProgress);
@@ -61,7 +61,7 @@ namespace LibationWinForms.BookLiberation
 
 		#endregion
 
-		#region IAudioDecodable event handlers
+		#region AudioDecodable event handlers
 		public override void AudioDecodable_RequestCoverArt(object sender, Action<byte[]> setCoverArtDelegate)
 		{
 			base.AudioDecodable_RequestCoverArt(sender, setCoverArtDelegate);
diff --git a/LibationWinForms/BookLiberation/AudioDecryptForm.cs b/LibationWinForms/BookLiberation/AudioDecryptForm.cs
index 753e761b..15570b64 100644
--- a/LibationWinForms/BookLiberation/AudioDecryptForm.cs
+++ b/LibationWinForms/BookLiberation/AudioDecryptForm.cs
@@ -16,7 +16,7 @@ namespace LibationWinForms.BookLiberation
 		public override string DecodeActionName => "Decrypting";
 		#endregion
 
-		#region IProcessable event handler overrides
+		#region Processable event handler overrides
 		public override void Processable_Begin(object sender, LibraryBook libraryBook)
 		{
 			LogMe.Info($"Download & Decrypt Step, Begin: {libraryBook.Book}");
diff --git a/LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs b/LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs
index d1642852..76f54a8a 100644
--- a/LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs
+++ b/LibationWinForms/BookLiberation/BaseForms/LiberationBaseForm.cs
@@ -58,13 +58,13 @@ namespace LibationWinForms.BookLiberation.BaseForms
 			processable.StatusUpdate += Processable_StatusUpdate;
 			processable.Completed += Processable_Completed;
 
-			//The form is created on IProcessable.Begin and we
-			//dispose of it on IProcessable.Completed
+			//The form is created on Processable.Begin and we
+			//dispose of it on Processable.Completed
 			processable.Completed += OnCompletedDispose;
 
 			//Don't unsubscribe from Dispose because it fires when
-			//IStreamable.StreamingCompleted closes the form, and
-			//the IProcessable events need to live past that event.
+			//Streamable.StreamingCompleted closes the form, and
+			//the Processable events need to live past that event.
 			processable.Completed += UnsubscribeProcessable;
 		}
 		private void Subscribe(AudioDecodable audioDecodable)
diff --git a/LibationWinForms/BookLiberation/DownloadForm.cs b/LibationWinForms/BookLiberation/DownloadForm.cs
index 7d487b89..3a307476 100644
--- a/LibationWinForms/BookLiberation/DownloadForm.cs
+++ b/LibationWinForms/BookLiberation/DownloadForm.cs
@@ -17,7 +17,7 @@ namespace LibationWinForms.BookLiberation
 		}
 
 
-		#region IStreamable event handler overrides
+		#region Streamable event handler overrides
 		public override void Streamable_StreamingBegin(object sender, string beginString)
 		{
 			base.Streamable_StreamingBegin(sender, beginString);