diff --git a/Makefile b/Makefile
index 077bf08892..86cca5c131 100644
--- a/Makefile
+++ b/Makefile
@@ -183,8 +183,8 @@ OpenRA.Editor.Form1.resources:
 editor: OpenRA.Editor.MapSelect.resources OpenRA.Editor.Form1.resources $(editor_TARGET)
 
 # Analyses mod yaml for easy to detect errors
-ralint_SRCS			:= $(shell find RALint/ -iname '*.cs')
-ralint_TARGET			= RALint.exe
+ralint_SRCS			:= $(shell find OpenRA.Lint/ -iname '*.cs')
+ralint_TARGET			= OpenRA.Lint.exe
 ralint_KIND			= exe
 ralint_DEPS			= $(fileformats_TARGET) $(game_TARGET)
 ralint_LIBS			= $(COMMON_LIBS) $(ralint_DEPS)
@@ -192,13 +192,13 @@ PROGRAMS 			+= ralint
 ralint: $(ralint_TARGET)
 
 test:
-	@mono --debug RALint.exe ra
+	@mono --debug OpenRA.Lint.exe ra
 	@echo "OpenRA.Lint: ra mod yaml checks passed."
-	@mono --debug RALint.exe cnc
+	@mono --debug OpenRA.Lint.exe cnc
 	@echo "OpenRA.Lint: cnc mod yaml checks passed."
-	@mono --debug RALint.exe d2k
+	@mono --debug OpenRA.Lint.exe d2k
 	@echo "OpenRA.Lint: d2k mod yaml checks passed."
-	@mono --debug RALint.exe ts
+	@mono --debug OpenRA.Lint.exe ts
 	@echo "OpenRA.Lint: ts mod yaml checks passed."
 
 # Builds and exports tilesets from a bitmap
diff --git a/RALint/RALint.csproj b/OpenRA.Lint/OpenRA.Lint.csproj
similarity index 96%
rename from RALint/RALint.csproj
rename to OpenRA.Lint/OpenRA.Lint.csproj
index de6c32c3b8..cff0dbe68b 100644
--- a/RALint/RALint.csproj
+++ b/OpenRA.Lint/OpenRA.Lint.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{F9FA4D9F-2302-470A-8A07-6E37F488C124}</ProjectGuid>
     <OutputType>Exe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>RALint</RootNamespace>
-    <AssemblyName>RALint</AssemblyName>
+    <RootNamespace>OpenRA</RootNamespace>
+    <AssemblyName>OpenRA.Lint</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <FileUpgradeFlags>
@@ -36,7 +36,7 @@
     <DebugSymbols>true</DebugSymbols>
     <DebugType>full</DebugType>
     <Optimize>false</Optimize>
-    <OutputPath>..\</OutputPath>
+    <OutputPath>..</OutputPath>
     <DefineConstants>DEBUG;TRACE</DefineConstants>
     <ErrorReport>prompt</ErrorReport>
     <WarningLevel>4</WarningLevel>
@@ -70,7 +70,7 @@
     <Reference Include="System.Xml" />
   </ItemGroup>
   <ItemGroup>
-    <Compile Include="RALint.cs" />
+    <Compile Include="YamlChecker.cs" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\OpenRA.FileFormats\OpenRA.FileFormats.csproj">
diff --git a/RALint/Settings.StyleCop b/OpenRA.Lint/Settings.StyleCop
similarity index 100%
rename from RALint/Settings.StyleCop
rename to OpenRA.Lint/Settings.StyleCop
diff --git a/RALint/RALint.cs b/OpenRA.Lint/YamlChecker.cs
similarity index 92%
rename from RALint/RALint.cs
rename to OpenRA.Lint/YamlChecker.cs
index ead78bede1..9416a990fa 100644
--- a/RALint/RALint.cs
+++ b/OpenRA.Lint/YamlChecker.cs
@@ -14,21 +14,21 @@ using OpenRA;
 using OpenRA.FileFormats;
 using OpenRA.Traits;
 
-namespace RALint
+namespace OpenRA.Lint
 {
-	static class RALint
+	static class YamlChecker
 	{
 		static int errors = 0;
 
 		static void EmitError(string e)
 		{
-			Console.WriteLine("RALint(1,1): Error: {0}", e);
+			Console.WriteLine("OpenRA.Lint(1,1): Error: {0}", e);
 			++errors;
 		}
 
 		static void EmitWarning(string e)
 		{
-			Console.WriteLine("RALint(1,1): Warning: {0}", e);
+			Console.WriteLine("OpenRA.Lint(1,1): Warning: {0}", e);
 		}
 
 		static int Main(string[] args)
diff --git a/OpenRA.sln b/OpenRA.sln
index 97e078699f..1f7cfd7087 100644
--- a/OpenRA.sln
+++ b/OpenRA.sln
@@ -21,7 +21,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Editor", "OpenRA.Edi
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.TilesetBuilder", "OpenRA.TilesetBuilder\OpenRA.TilesetBuilder.csproj", "{1A8E50CC-EE32-4E57-8842-0C39C8EA7541}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RALint", "RALint\RALint.csproj", "{F9FA4D9F-2302-470A-8A07-6E37F488C124}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Lint", "OpenRA.Lint\OpenRA.Lint.csproj", "{F9FA4D9F-2302-470A-8A07-6E37F488C124}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Utility", "OpenRA.Utility\OpenRA.Utility.csproj", "{F33337BE-CB69-4B24-850F-07D23E408DDF}"
 EndProject