diff --git a/CUETools.Codecs.FlaCuda/FlaCudaWriter.cs b/CUETools.Codecs.FlaCuda/FlaCudaWriter.cs
index b2cd032..5cf9e7e 100644
--- a/CUETools.Codecs.FlaCuda/FlaCudaWriter.cs
+++ b/CUETools.Codecs.FlaCuda/FlaCudaWriter.cs
@@ -25,7 +25,7 @@ using System.Security.Cryptography;
 using System.Threading;
 using System.Text;
 using CUETools.Codecs;
-using CUETools.Codecs.FLAKE;
+using CUETools.Codecs.Flake;
 using GASS.CUDA;
 using GASS.CUDA.Types;
 
diff --git a/CUETools.Codecs.FLAKE/COPYING b/CUETools.Codecs.Flake/COPYING
similarity index 100%
rename from CUETools.Codecs.FLAKE/COPYING
rename to CUETools.Codecs.Flake/COPYING
diff --git a/CUETools.Codecs.FLAKE/CUETools.Codecs.FLAKE.csproj b/CUETools.Codecs.Flake/CUETools.Codecs.FLAKE.csproj
similarity index 100%
rename from CUETools.Codecs.FLAKE/CUETools.Codecs.FLAKE.csproj
rename to CUETools.Codecs.Flake/CUETools.Codecs.FLAKE.csproj
diff --git a/CUETools.Codecs.FLAKE/ChannelMode.cs b/CUETools.Codecs.Flake/ChannelMode.cs
similarity index 100%
rename from CUETools.Codecs.FLAKE/ChannelMode.cs
rename to CUETools.Codecs.Flake/ChannelMode.cs
diff --git a/CUETools.Codecs.FLAKE/FlacFrame.cs b/CUETools.Codecs.Flake/FlacFrame.cs
similarity index 100%
rename from CUETools.Codecs.FLAKE/FlacFrame.cs
rename to CUETools.Codecs.Flake/FlacFrame.cs
diff --git a/CUETools.Codecs.FLAKE/FlacSubframe.cs b/CUETools.Codecs.Flake/FlacSubframe.cs
similarity index 100%
rename from CUETools.Codecs.FLAKE/FlacSubframe.cs
rename to CUETools.Codecs.Flake/FlacSubframe.cs
diff --git a/CUETools.Codecs.FLAKE/FlacSubframeInfo.cs b/CUETools.Codecs.Flake/FlacSubframeInfo.cs
similarity index 100%
rename from CUETools.Codecs.FLAKE/FlacSubframeInfo.cs
rename to CUETools.Codecs.Flake/FlacSubframeInfo.cs
diff --git a/CUETools.Codecs.FLAKE/Flake.cs b/CUETools.Codecs.Flake/Flake.cs
similarity index 100%
rename from CUETools.Codecs.FLAKE/Flake.cs
rename to CUETools.Codecs.Flake/Flake.cs
diff --git a/CUETools.Codecs.FLAKE/MetadataType.cs b/CUETools.Codecs.Flake/MetadataType.cs
similarity index 100%
rename from CUETools.Codecs.FLAKE/MetadataType.cs
rename to CUETools.Codecs.Flake/MetadataType.cs
diff --git a/CUETools.Codecs.FLAKE/OrderMethod.cs b/CUETools.Codecs.Flake/OrderMethod.cs
similarity index 100%
rename from CUETools.Codecs.FLAKE/OrderMethod.cs
rename to CUETools.Codecs.Flake/OrderMethod.cs
diff --git a/CUETools.Codecs.FLAKE/PredictionType.cs b/CUETools.Codecs.Flake/PredictionType.cs
similarity index 100%
rename from CUETools.Codecs.FLAKE/PredictionType.cs
rename to CUETools.Codecs.Flake/PredictionType.cs
diff --git a/CUETools.Codecs.FLAKE/Properties/Resources.Designer.cs b/CUETools.Codecs.Flake/Properties/Resources.Designer.cs
similarity index 100%
rename from CUETools.Codecs.FLAKE/Properties/Resources.Designer.cs
rename to CUETools.Codecs.Flake/Properties/Resources.Designer.cs
diff --git a/CUETools.Codecs.FLAKE/Properties/Resources.resx b/CUETools.Codecs.Flake/Properties/Resources.resx
similarity index 100%
rename from CUETools.Codecs.FLAKE/Properties/Resources.resx
rename to CUETools.Codecs.Flake/Properties/Resources.resx
diff --git a/CUETools.Codecs.FLAKE/Properties/Resources.ru-RU.resx b/CUETools.Codecs.Flake/Properties/Resources.ru-RU.resx
similarity index 100%
rename from CUETools.Codecs.FLAKE/Properties/Resources.ru-RU.resx
rename to CUETools.Codecs.Flake/Properties/Resources.ru-RU.resx
diff --git a/CUETools.Codecs.FLAKE/RiceContext.cs b/CUETools.Codecs.Flake/RiceContext.cs
similarity index 100%
rename from CUETools.Codecs.FLAKE/RiceContext.cs
rename to CUETools.Codecs.Flake/RiceContext.cs
diff --git a/CUETools.Codecs.FLAKE/SeekPoint.cs b/CUETools.Codecs.Flake/SeekPoint.cs
similarity index 100%
rename from CUETools.Codecs.FLAKE/SeekPoint.cs
rename to CUETools.Codecs.Flake/SeekPoint.cs
diff --git a/CUETools.Codecs.FLAKE/StereoMethod.cs b/CUETools.Codecs.Flake/StereoMethod.cs
similarity index 100%
rename from CUETools.Codecs.FLAKE/StereoMethod.cs
rename to CUETools.Codecs.Flake/StereoMethod.cs
diff --git a/CUETools.Codecs.FLAKE/SubframeType.cs b/CUETools.Codecs.Flake/SubframeType.cs
similarity index 100%
rename from CUETools.Codecs.FLAKE/SubframeType.cs
rename to CUETools.Codecs.Flake/SubframeType.cs
diff --git a/CUETools.Codecs.FLAKE/WindowFunction.cs b/CUETools.Codecs.Flake/WindowFunction.cs
similarity index 100%
rename from CUETools.Codecs.FLAKE/WindowFunction.cs
rename to CUETools.Codecs.Flake/WindowFunction.cs
diff --git a/CUETools.Codecs.FLAKE/WindowMethod.cs b/CUETools.Codecs.Flake/WindowMethod.cs
similarity index 100%
rename from CUETools.Codecs.FLAKE/WindowMethod.cs
rename to CUETools.Codecs.Flake/WindowMethod.cs
diff --git a/CUETools.FlaCudaExe/Program.cs b/CUETools.FlaCudaExe/Program.cs
index 24c85c2..07b5408 100644
--- a/CUETools.FlaCudaExe/Program.cs
+++ b/CUETools.FlaCudaExe/Program.cs
@@ -22,7 +22,7 @@ using System.Collections.Generic;
 using System.Text;
 using System.IO;
 using CUETools.Codecs;
-using CUETools.Codecs.FLAKE;
+using CUETools.Codecs.Flake;
 using CUETools.Codecs.FlaCuda;
 
 namespace CUETools.FlaCudaExe
diff --git a/CUETools/CUETools.TestCodecs/FlakeWriterTest.cs b/CUETools/CUETools.TestCodecs/FlakeWriterTest.cs
index 3bfebf0..ac1e0f7 100644
--- a/CUETools/CUETools.TestCodecs/FlakeWriterTest.cs
+++ b/CUETools/CUETools.TestCodecs/FlakeWriterTest.cs
@@ -10,8 +10,8 @@ using CUETools.Codecs.Flake;
 namespace CUETools.TestCodecs
 {
 	/// <summary>
-	///This is a test class for CUETools.Codecs.FLAKE.FlakeWriter and is intended
-	///to contain all CUETools.Codecs.FLAKE.FlakeWriter Unit Tests
+	///This is a test class for CUETools.Codecs.Flake.FlakeWriter and is intended
+	///to contain all CUETools.Codecs.Flake.FlakeWriter Unit Tests
 	///</summary>
 	[TestClass()]
 	public class FlakeWriterTest