diff --git a/OpenRA.Server/OpenRA.Server.csproj b/OpenRA.Server/OpenRA.Server.csproj
index a69c7eab65..c1eaa4df1d 100644
--- a/OpenRA.Server/OpenRA.Server.csproj
+++ b/OpenRA.Server/OpenRA.Server.csproj
@@ -55,9 +55,9 @@
     <Compile Include="ServerOrder.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OpenRa.FileFormats\OpenRa.FileFormats.csproj">
+    <ProjectReference Include="..\OpenRa.FileFormats\OpenRA.FileFormats.csproj">
       <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
-      <Name>OpenRa.FileFormats</Name>
+      <Name>OpenRA.FileFormats</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/OpenRA.Server/Server.cs b/OpenRA.Server/Server.cs
index 3423c4ac93..393a77af29 100644
--- a/OpenRA.Server/Server.cs
+++ b/OpenRA.Server/Server.cs
@@ -26,8 +26,8 @@ using System.Linq;
 using System.Net;
 using System.Net.Sockets;
 using System.Security.Cryptography;
-using OpenRa;
-using OpenRa.FileFormats;
+using OpenRA;
+using OpenRA.FileFormats;
 
 namespace OpenRA.Server
 {
diff --git a/OpenRa.FileFormats/AudLoader.cs b/OpenRa.FileFormats/AudLoader.cs
index 2758677fd8..9bc8c84d10 100644
--- a/OpenRa.FileFormats/AudLoader.cs
+++ b/OpenRa.FileFormats/AudLoader.cs
@@ -21,7 +21,7 @@
 using System;
 using System.IO;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	[Flags]
 	enum SoundFlags
diff --git a/OpenRa.FileFormats/Blowfish.cs b/OpenRa.FileFormats/Blowfish.cs
index 143bbf8cef..72d6b62787 100644
--- a/OpenRa.FileFormats/Blowfish.cs
+++ b/OpenRa.FileFormats/Blowfish.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	class Blowfish
 	{
diff --git a/OpenRa.FileFormats/BlowfishKeyProvider.cs b/OpenRa.FileFormats/BlowfishKeyProvider.cs
index f4df352c39..759af0a08a 100644
--- a/OpenRa.FileFormats/BlowfishKeyProvider.cs
+++ b/OpenRa.FileFormats/BlowfishKeyProvider.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Linq;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
     /* possibly the fugliest C# i've ever seen. */
 
diff --git a/OpenRa.FileFormats/Cache.cs b/OpenRa.FileFormats/Cache.cs
index 324681577a..92f0e0fa72 100644
--- a/OpenRa.FileFormats/Cache.cs
+++ b/OpenRa.FileFormats/Cache.cs
@@ -22,7 +22,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class Cache<T, U> : IEnumerable<KeyValuePair<T, U>>
 	{
diff --git a/OpenRa.FileFormats/Collections/Set.cs b/OpenRa.FileFormats/Collections/Set.cs
index 94d6686c4f..3738562091 100755
--- a/OpenRa.FileFormats/Collections/Set.cs
+++ b/OpenRa.FileFormats/Collections/Set.cs
@@ -22,7 +22,7 @@ using System;
 using System.Collections;
 using System.Collections.Generic;
 
-namespace OpenRa.Collections
+namespace OpenRA.Collections
 {
 	public class Set<T> : IEnumerable<T>
 	{
diff --git a/OpenRa.FileFormats/DisposableAction.cs b/OpenRa.FileFormats/DisposableAction.cs
index f4fad8b0ef..ae1836e321 100644
--- a/OpenRa.FileFormats/DisposableAction.cs
+++ b/OpenRa.FileFormats/DisposableAction.cs
@@ -20,7 +20,7 @@
 
 using System;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public class DisposableAction : IDisposable
 	{
diff --git a/OpenRa.FileFormats/Dune2ShpReader.cs b/OpenRa.FileFormats/Dune2ShpReader.cs
index 1afb8d009c..53060bbdfe 100644
--- a/OpenRa.FileFormats/Dune2ShpReader.cs
+++ b/OpenRa.FileFormats/Dune2ShpReader.cs
@@ -23,7 +23,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public enum Dune2ImageFlags : int
 	{
diff --git a/OpenRa.FileFormats/Exts.cs b/OpenRa.FileFormats/Exts.cs
index 98ae6679aa..992cce920a 100644
--- a/OpenRa.FileFormats/Exts.cs
+++ b/OpenRa.FileFormats/Exts.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public static class Exts
 	{
diff --git a/OpenRa.FileFormats/FieldLoader.cs b/OpenRa.FileFormats/FieldLoader.cs
index 4c7288be0b..a1db3f89dc 100644
--- a/OpenRa.FileFormats/FieldLoader.cs
+++ b/OpenRa.FileFormats/FieldLoader.cs
@@ -22,7 +22,7 @@ using System;
 using System.Linq;
 using System.Reflection;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public static class FieldLoader
 	{
diff --git a/OpenRa.FileFormats/FileSystem.cs b/OpenRa.FileFormats/FileSystem.cs
index 666f15442e..0e1d7672e3 100644
--- a/OpenRa.FileFormats/FileSystem.cs
+++ b/OpenRa.FileFormats/FileSystem.cs
@@ -22,7 +22,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public static class FileSystem
 	{
diff --git a/OpenRa.FileFormats/Folder.cs b/OpenRa.FileFormats/Folder.cs
index 6cc5c5f194..e5e4972ed7 100644
--- a/OpenRa.FileFormats/Folder.cs
+++ b/OpenRa.FileFormats/Folder.cs
@@ -21,7 +21,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class Folder : IFolder
 	{
diff --git a/OpenRa.FileFormats/Format2.cs b/OpenRa.FileFormats/Format2.cs
index ccf2a11ff8..2b6846a231 100644
--- a/OpenRa.FileFormats/Format2.cs
+++ b/OpenRa.FileFormats/Format2.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public static class Format2
 	{
diff --git a/OpenRa.FileFormats/Format40.cs b/OpenRa.FileFormats/Format40.cs
index cbfd2b031a..65073ef1d7 100644
--- a/OpenRa.FileFormats/Format40.cs
+++ b/OpenRa.FileFormats/Format40.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public static class Format40
 	{
diff --git a/OpenRa.FileFormats/Format80.cs b/OpenRa.FileFormats/Format80.cs
index 259613f176..7cb1b1f778 100644
--- a/OpenRa.FileFormats/Format80.cs
+++ b/OpenRa.FileFormats/Format80.cs
@@ -20,7 +20,7 @@
 
 using System;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
     class FastByteReader
     {
diff --git a/OpenRa.FileFormats/Graphics/IGraphicsDevice.cs b/OpenRa.FileFormats/Graphics/IGraphicsDevice.cs
index ef810da763..dc6a847fcd 100755
--- a/OpenRa.FileFormats/Graphics/IGraphicsDevice.cs
+++ b/OpenRa.FileFormats/Graphics/IGraphicsDevice.cs
@@ -22,7 +22,7 @@ using System;
 using System.Drawing;
 using System.IO;
 
-namespace OpenRa.FileFormats.Graphics
+namespace OpenRA.FileFormats.Graphics
 {
 	[AttributeUsage( AttributeTargets.Assembly )]
 	public class RendererAttribute : Attribute
diff --git a/OpenRa.FileFormats/Graphics/Vertex.cs b/OpenRa.FileFormats/Graphics/Vertex.cs
index 76843c604e..cd2e8c6a87 100644
--- a/OpenRa.FileFormats/Graphics/Vertex.cs
+++ b/OpenRa.FileFormats/Graphics/Vertex.cs
@@ -20,7 +20,7 @@
 
 using System.Runtime.InteropServices;
 
-namespace OpenRa.FileFormats.Graphics
+namespace OpenRA.FileFormats.Graphics
 {
 	[StructLayout(LayoutKind.Sequential)]
 	public struct Vertex
diff --git a/OpenRa.FileFormats/IPaletteRemap.cs b/OpenRa.FileFormats/IPaletteRemap.cs
index 653986b404..953ec19f82 100644
--- a/OpenRa.FileFormats/IPaletteRemap.cs
+++ b/OpenRa.FileFormats/IPaletteRemap.cs
@@ -20,7 +20,7 @@
 
 using System.Drawing;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public interface IPaletteRemap
 	{
diff --git a/OpenRa.FileFormats/IniFile.cs b/OpenRa.FileFormats/IniFile.cs
index f752693382..7d850f30ec 100644
--- a/OpenRa.FileFormats/IniFile.cs
+++ b/OpenRa.FileFormats/IniFile.cs
@@ -24,7 +24,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text.RegularExpressions;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class IniFile
 	{
diff --git a/OpenRa.FileFormats/Lazy.cs b/OpenRa.FileFormats/Lazy.cs
index 78412d5aab..5497c06570 100644
--- a/OpenRa.FileFormats/Lazy.cs
+++ b/OpenRa.FileFormats/Lazy.cs
@@ -20,7 +20,7 @@
 
 using System;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class Lazy<T>
 	{
diff --git a/OpenRa.FileFormats/Map.cs b/OpenRa.FileFormats/Map.cs
index 16056cc7c9..c3ab61b26d 100644
--- a/OpenRa.FileFormats/Map.cs
+++ b/OpenRa.FileFormats/Map.cs
@@ -24,7 +24,7 @@ using System.IO;
 using System.Linq;
 using System.Text;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class Map
 	{
diff --git a/OpenRa.FileFormats/MiniYaml.cs b/OpenRa.FileFormats/MiniYaml.cs
index 4901c49bfd..89f0e5c3a7 100755
--- a/OpenRa.FileFormats/MiniYaml.cs
+++ b/OpenRa.FileFormats/MiniYaml.cs
@@ -23,7 +23,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	using MiniYamlNodes = Dictionary<string, MiniYaml>;
 
diff --git a/OpenRa.FileFormats/OpenRa.FileFormats.csproj b/OpenRa.FileFormats/OpenRa.FileFormats.csproj
index aa04f7584a..893ee21c9c 100644
--- a/OpenRa.FileFormats/OpenRa.FileFormats.csproj
+++ b/OpenRa.FileFormats/OpenRa.FileFormats.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -8,8 +8,8 @@
     <ProjectGuid>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRa.FileFormats</RootNamespace>
-    <AssemblyName>OpenRa.FileFormats</AssemblyName>
+    <RootNamespace>OpenRA.FileFormats</RootNamespace>
+    <AssemblyName>OpenRA.FileFormats</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
diff --git a/OpenRa.FileFormats/Package.cs b/OpenRa.FileFormats/Package.cs
index 69c0d77efd..1ffa2c28ef 100644
--- a/OpenRa.FileFormats/Package.cs
+++ b/OpenRa.FileFormats/Package.cs
@@ -23,7 +23,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public interface IFolder
 	{
diff --git a/OpenRa.FileFormats/PackageEntry.cs b/OpenRa.FileFormats/PackageEntry.cs
index 40dcd32a1d..b863b1971b 100644
--- a/OpenRa.FileFormats/PackageEntry.cs
+++ b/OpenRa.FileFormats/PackageEntry.cs
@@ -22,7 +22,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Text;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class PackageEntry
 	{
diff --git a/OpenRa.FileFormats/Pair.cs b/OpenRa.FileFormats/Pair.cs
index b3e83fc3c7..7436a1d583 100644
--- a/OpenRa.FileFormats/Pair.cs
+++ b/OpenRa.FileFormats/Pair.cs
@@ -20,7 +20,7 @@
 
 using System.Collections.Generic;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public struct Pair<T, U>
 	{
diff --git a/OpenRa.FileFormats/Palette.cs b/OpenRa.FileFormats/Palette.cs
index e3b85a7d5d..f58ba580c9 100644
--- a/OpenRa.FileFormats/Palette.cs
+++ b/OpenRa.FileFormats/Palette.cs
@@ -22,7 +22,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class Palette
 	{
diff --git a/OpenRa.FileFormats/PlayerColorRemap.cs b/OpenRa.FileFormats/PlayerColorRemap.cs
index 12c2f394e0..17ff46f203 100644
--- a/OpenRa.FileFormats/PlayerColorRemap.cs
+++ b/OpenRa.FileFormats/PlayerColorRemap.cs
@@ -23,7 +23,7 @@ using System.Drawing;
 using System.IO;
 using System.Linq;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class PlayerColorRemap : IPaletteRemap
 	{
diff --git a/OpenRa.FileFormats/PriorityQueue.cs b/OpenRa.FileFormats/PriorityQueue.cs
index 71fe120a72..db2ad43274 100644
--- a/OpenRa.FileFormats/PriorityQueue.cs
+++ b/OpenRa.FileFormats/PriorityQueue.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class PriorityQueue<T>
 			where T : IComparable<T>
diff --git a/OpenRa.FileFormats/ProtocolVersion.cs b/OpenRa.FileFormats/ProtocolVersion.cs
index d8aed9aa05..a091347c99 100644
--- a/OpenRa.FileFormats/ProtocolVersion.cs
+++ b/OpenRa.FileFormats/ProtocolVersion.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public static class ProtocolVersion
 	{
diff --git a/OpenRa.FileFormats/Session.cs b/OpenRa.FileFormats/Session.cs
index 0451c98aaf..c28fdc0e65 100644
--- a/OpenRa.FileFormats/Session.cs
+++ b/OpenRa.FileFormats/Session.cs
@@ -21,7 +21,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class Session
 	{
diff --git a/OpenRa.FileFormats/ShpReader.cs b/OpenRa.FileFormats/ShpReader.cs
index 69835a14ba..fc78f42c4a 100644
--- a/OpenRa.FileFormats/ShpReader.cs
+++ b/OpenRa.FileFormats/ShpReader.cs
@@ -23,7 +23,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class ImageHeader
 	{
diff --git a/OpenRa.FileFormats/ShroudPaletteRemap.cs b/OpenRa.FileFormats/ShroudPaletteRemap.cs
index ae22c5484a..6f02ef5532 100644
--- a/OpenRa.FileFormats/ShroudPaletteRemap.cs
+++ b/OpenRa.FileFormats/ShroudPaletteRemap.cs
@@ -20,7 +20,7 @@
 
 using System.Drawing;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class ShroudPaletteRemap : IPaletteRemap
 	{
diff --git a/OpenRa.FileFormats/SingleColorRemap.cs b/OpenRa.FileFormats/SingleColorRemap.cs
index 0e8fbe2b9d..143c5c0c0b 100644
--- a/OpenRa.FileFormats/SingleColorRemap.cs
+++ b/OpenRa.FileFormats/SingleColorRemap.cs
@@ -20,7 +20,7 @@
 
 using System.Drawing;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class SingleColorRemap : IPaletteRemap
 	{
diff --git a/OpenRa.FileFormats/Support/Log.cs b/OpenRa.FileFormats/Support/Log.cs
index 78873a9773..4bc5a54051 100755
--- a/OpenRa.FileFormats/Support/Log.cs
+++ b/OpenRa.FileFormats/Support/Log.cs
@@ -20,7 +20,7 @@
 
 using System.IO;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public static class Log
 	{
diff --git a/OpenRa.FileFormats/Support/Stopwatch.cs b/OpenRa.FileFormats/Support/Stopwatch.cs
index 5eddc266f2..75f2fd5cd2 100755
--- a/OpenRa.FileFormats/Support/Stopwatch.cs
+++ b/OpenRa.FileFormats/Support/Stopwatch.cs
@@ -19,7 +19,7 @@
 #endregion
 
 using Tao.Sdl;
-namespace OpenRa.Support
+namespace OpenRA.Support
 {
 	public class Stopwatch
 	{
diff --git a/OpenRa.FileFormats/Support/Timer.cs b/OpenRa.FileFormats/Support/Timer.cs
index 2f8760fb68..b76d46d69d 100755
--- a/OpenRa.FileFormats/Support/Timer.cs
+++ b/OpenRa.FileFormats/Support/Timer.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Support
+namespace OpenRA.Support
 {
 	public static class Timer
 	{
diff --git a/OpenRa.FileFormats/Terrain.cs b/OpenRa.FileFormats/Terrain.cs
index b615a9d88d..bf321d174f 100644
--- a/OpenRa.FileFormats/Terrain.cs
+++ b/OpenRa.FileFormats/Terrain.cs
@@ -21,7 +21,7 @@
 using System.Collections.Generic;
 using System.IO;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class Terrain
 	{
diff --git a/OpenRa.FileFormats/TileReference.cs b/OpenRa.FileFormats/TileReference.cs
index 183c8e30dd..c4ca4d069e 100644
--- a/OpenRa.FileFormats/TileReference.cs
+++ b/OpenRa.FileFormats/TileReference.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public struct TileReference
 	{
diff --git a/OpenRa.FileFormats/TileSet.cs b/OpenRa.FileFormats/TileSet.cs
index 0ae4a2685d..905c30263b 100644
--- a/OpenRa.FileFormats/TileSet.cs
+++ b/OpenRa.FileFormats/TileSet.cs
@@ -22,7 +22,7 @@ using System.Collections.Generic;
 using System.Globalization;
 using System.IO;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class TileSet
 	{
diff --git a/OpenRa.FileFormats/TreeReference.cs b/OpenRa.FileFormats/TreeReference.cs
index a2077987c4..24163be6c3 100644
--- a/OpenRa.FileFormats/TreeReference.cs
+++ b/OpenRa.FileFormats/TreeReference.cs
@@ -20,7 +20,7 @@
 
 using System.Drawing;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public struct TreeReference
 	{
diff --git a/OpenRa.FileFormats/Tuple.cs b/OpenRa.FileFormats/Tuple.cs
index 822bc092f3..ce59ea03be 100644
--- a/OpenRa.FileFormats/Tuple.cs
+++ b/OpenRa.FileFormats/Tuple.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class Tuple<A, B, C>
 	{
diff --git a/OpenRa.FileFormats/TypeDictionary.cs b/OpenRa.FileFormats/TypeDictionary.cs
index 74c4034fb1..6a926517b0 100644
--- a/OpenRa.FileFormats/TypeDictionary.cs
+++ b/OpenRa.FileFormats/TypeDictionary.cs
@@ -22,7 +22,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class TypeDictionary
 	{
diff --git a/OpenRa.FileFormats/Walkability.cs b/OpenRa.FileFormats/Walkability.cs
index 086d7a922d..1d99ecf3d4 100644
--- a/OpenRa.FileFormats/Walkability.cs
+++ b/OpenRa.FileFormats/Walkability.cs
@@ -21,7 +21,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OpenRa.FileFormats
+namespace OpenRA.FileFormats
 {
 	public class TileTemplate
 	{
diff --git a/OpenRa.FileFormats/float2.cs b/OpenRa.FileFormats/float2.cs
index 9495f52464..87a6200eb1 100644
--- a/OpenRa.FileFormats/float2.cs
+++ b/OpenRa.FileFormats/float2.cs
@@ -22,7 +22,7 @@ using System;
 using System.Drawing;
 using System.Runtime.InteropServices;
 
-namespace OpenRa
+namespace OpenRA
 {
 	[StructLayout(LayoutKind.Sequential)]
 	public struct float2
diff --git a/OpenRa.FileFormats/int2.cs b/OpenRa.FileFormats/int2.cs
index fbdeb6ae19..7567288195 100644
--- a/OpenRa.FileFormats/int2.cs
+++ b/OpenRa.FileFormats/int2.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Drawing;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public struct int2
 	{
diff --git a/OpenRa.Game/Actor.cs b/OpenRa.Game/Actor.cs
index e287229e80..f3af5963e8 100755
--- a/OpenRa.Game/Actor.cs
+++ b/OpenRa.Game/Actor.cs
@@ -21,12 +21,12 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRa.FileFormats;
-using OpenRa.GameRules;
-using OpenRa.Traits;
-using OpenRa.Traits.Activities;
+using OpenRA.FileFormats;
+using OpenRA.GameRules;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public class Actor
 	{
diff --git a/OpenRa.Game/Chat.cs b/OpenRa.Game/Chat.cs
index 73d9d111c8..4117faeaf2 100644
--- a/OpenRa.Game/Chat.cs
+++ b/OpenRa.Game/Chat.cs
@@ -20,10 +20,10 @@
 
 using System.Collections.Generic;
 using System.Drawing;
-using OpenRa.FileFormats;
-using OpenRa.Traits;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
 
-namespace OpenRa
+namespace OpenRA
 {
 	class Chat
 	{
diff --git a/OpenRa.Game/Chrome.cs b/OpenRa.Game/Chrome.cs
index cbd7e891af..f3cdf00080 100644
--- a/OpenRa.Game/Chrome.cs
+++ b/OpenRa.Game/Chrome.cs
@@ -23,13 +23,13 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.IO;
 using System.Linq;
-using OpenRa.FileFormats;
-using OpenRa.Graphics;
-using OpenRa.Orders;
-using OpenRa.Support;
-using OpenRa.Traits;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
+using OpenRA.Orders;
+using OpenRA.Support;
+using OpenRA.Traits;
 
-namespace OpenRa
+namespace OpenRA
 {
 	class Chrome : IHandleInput
 	{
@@ -129,7 +129,7 @@ namespace OpenRa
 			
 			tabImageNames = groups.Select(
 				(g, i) => Pair.New(g,
-					OpenRa.Graphics.Util.MakeArray(3,
+					OpenRA.Graphics.Util.MakeArray(3,
 						n => i.ToString())))
 				.ToDictionary(a => a.First, a => a.Second);
 
diff --git a/OpenRa.Game/Combat.cs b/OpenRa.Game/Combat.cs
index 5ddc5ad713..b5ac5513cc 100644
--- a/OpenRa.Game/Combat.cs
+++ b/OpenRa.Game/Combat.cs
@@ -20,11 +20,11 @@
 
 using System;
 using System.Linq;
-using OpenRa.Effects;
-using OpenRa.GameRules;
-using OpenRa.Traits;
+using OpenRA.Effects;
+using OpenRA.GameRules;
+using OpenRA.Traits;
 
-namespace OpenRa
+namespace OpenRA
 {
 	static class Combat			/* some utility bits that are shared between various things */
 	{
diff --git a/OpenRa.Game/Controller.cs b/OpenRa.Game/Controller.cs
index c85e7ff79d..bdbd16fc60 100644
--- a/OpenRa.Game/Controller.cs
+++ b/OpenRa.Game/Controller.cs
@@ -20,12 +20,12 @@
 
 using System;
 using System.Linq;
-using OpenRa.FileFormats;
-using OpenRa.Graphics;
-using OpenRa.Orders;
-using OpenRa.Traits;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
+using OpenRA.Orders;
+using OpenRA.Traits;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public class Controller : IHandleInput
 	{
diff --git a/OpenRa.Game/Cursor.cs b/OpenRa.Game/Cursor.cs
index d2cb8dc622..fb4605d222 100644
--- a/OpenRa.Game/Cursor.cs
+++ b/OpenRa.Game/Cursor.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.Graphics;
+using OpenRA.Graphics;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public class Cursor
 	{
diff --git a/OpenRa.Game/Effects/Bullet.cs b/OpenRa.Game/Effects/Bullet.cs
index 1ba4c264d7..cc84c643d5 100755
--- a/OpenRa.Game/Effects/Bullet.cs
+++ b/OpenRa.Game/Effects/Bullet.cs
@@ -19,11 +19,11 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.GameRules;
-using OpenRa.Graphics;
-using OpenRa.Traits;
+using OpenRA.GameRules;
+using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRa.Effects
+namespace OpenRA.Effects
 {
 	public class Bullet : IEffect
 	{
diff --git a/OpenRa.Game/Effects/Corpse.cs b/OpenRa.Game/Effects/Corpse.cs
index 6ec72dcf3c..f780c42541 100755
--- a/OpenRa.Game/Effects/Corpse.cs
+++ b/OpenRa.Game/Effects/Corpse.cs
@@ -19,10 +19,10 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Graphics;
-using OpenRa.Traits;
+using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRa.Effects
+namespace OpenRA.Effects
 {
 	class Corpse : IEffect
 	{
diff --git a/OpenRa.Game/Effects/DelayedAction.cs b/OpenRa.Game/Effects/DelayedAction.cs
index e4e3a57b94..a3e91eea6c 100755
--- a/OpenRa.Game/Effects/DelayedAction.cs
+++ b/OpenRa.Game/Effects/DelayedAction.cs
@@ -20,9 +20,9 @@
 
 using System;
 using System.Collections.Generic;
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.Effects
+namespace OpenRA.Effects
 {
 	public class DelayedAction : IEffect
 	{
diff --git a/OpenRa.Game/Effects/Explosion.cs b/OpenRa.Game/Effects/Explosion.cs
index a83985608b..7691396bf9 100755
--- a/OpenRa.Game/Effects/Explosion.cs
+++ b/OpenRa.Game/Effects/Explosion.cs
@@ -19,10 +19,10 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Graphics;
-using OpenRa.Traits;
+using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRa.Effects
+namespace OpenRA.Effects
 {
 	public class Explosion : IEffect
 	{
diff --git a/OpenRa.Game/Effects/FlashTarget.cs b/OpenRa.Game/Effects/FlashTarget.cs
index 3b68fc7c73..d6ee3a934e 100755
--- a/OpenRa.Game/Effects/FlashTarget.cs
+++ b/OpenRa.Game/Effects/FlashTarget.cs
@@ -20,9 +20,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.Effects
+namespace OpenRA.Effects
 {
 	class FlashTarget : IEffect
 	{
diff --git a/OpenRa.Game/Effects/IEffect.cs b/OpenRa.Game/Effects/IEffect.cs
index 69bc43ff93..aef764ddad 100755
--- a/OpenRa.Game/Effects/IEffect.cs
+++ b/OpenRa.Game/Effects/IEffect.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.Effects
+namespace OpenRA.Effects
 {
 	public interface IEffect
 	{
diff --git a/OpenRa.Game/Effects/LaserZap.cs b/OpenRa.Game/Effects/LaserZap.cs
index 689fa04fe9..baef036339 100644
--- a/OpenRa.Game/Effects/LaserZap.cs
+++ b/OpenRa.Game/Effects/LaserZap.cs
@@ -20,9 +20,9 @@
 
 using System.Collections.Generic;
 using System.Drawing;
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.Effects
+namespace OpenRA.Effects
 {
 	class LaserZap : IEffect
 	{
diff --git a/OpenRa.Game/Effects/Missile.cs b/OpenRa.Game/Effects/Missile.cs
index 5ec6ee70cc..93531dfcef 100755
--- a/OpenRa.Game/Effects/Missile.cs
+++ b/OpenRa.Game/Effects/Missile.cs
@@ -20,11 +20,11 @@
 
 using System;
 using System.Collections.Generic;
-using OpenRa.GameRules;
-using OpenRa.Graphics;
-using OpenRa.Traits;
+using OpenRA.GameRules;
+using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRa.Effects
+namespace OpenRA.Effects
 {
 	class Missile : IEffect
 	{
diff --git a/OpenRa.Game/Effects/MoveFlash.cs b/OpenRa.Game/Effects/MoveFlash.cs
index 7878b741ea..51723594bf 100755
--- a/OpenRa.Game/Effects/MoveFlash.cs
+++ b/OpenRa.Game/Effects/MoveFlash.cs
@@ -19,10 +19,10 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Graphics;
-using OpenRa.Traits;
+using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRa.Effects
+namespace OpenRA.Effects
 {
 	class MoveFlash : IEffect
 	{
diff --git a/OpenRa.Game/Effects/RepairIndicator.cs b/OpenRa.Game/Effects/RepairIndicator.cs
index 084faefffd..93bcb0dcda 100755
--- a/OpenRa.Game/Effects/RepairIndicator.cs
+++ b/OpenRa.Game/Effects/RepairIndicator.cs
@@ -19,10 +19,10 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Graphics;
-using OpenRa.Traits;
+using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRa.Effects
+namespace OpenRA.Effects
 {
 	class RepairIndicator : IEffect
 	{
diff --git a/OpenRa.Game/Effects/Smoke.cs b/OpenRa.Game/Effects/Smoke.cs
index 58c0ded841..f67637401d 100755
--- a/OpenRa.Game/Effects/Smoke.cs
+++ b/OpenRa.Game/Effects/Smoke.cs
@@ -19,10 +19,10 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Graphics;
-using OpenRa.Traits;
+using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRa.Effects
+namespace OpenRA.Effects
 {
 	class Smoke : IEffect
 	{
diff --git a/OpenRa.Game/Effects/TeslaZap.cs b/OpenRa.Game/Effects/TeslaZap.cs
index 83a37983a9..9df281dbe2 100755
--- a/OpenRa.Game/Effects/TeslaZap.cs
+++ b/OpenRa.Game/Effects/TeslaZap.cs
@@ -19,10 +19,10 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Graphics;
-using OpenRa.Traits;
+using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRa.Effects
+namespace OpenRA.Effects
 {
 	class TeslaZap : IEffect
 	{
diff --git a/OpenRa.Game/Exts.cs b/OpenRa.Game/Exts.cs
index bfddf8a84d..6da6b1e8b7 100644
--- a/OpenRa.Game/Exts.cs
+++ b/OpenRa.Game/Exts.cs
@@ -21,10 +21,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.GameRules;
-using OpenRa.Traits;
+using OpenRA.GameRules;
+using OpenRA.Traits;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public static class Exts
 	{
diff --git a/OpenRa.Game/Game.cs b/OpenRa.Game/Game.cs
index a094dd4111..c8c9da67d4 100644
--- a/OpenRa.Game/Game.cs
+++ b/OpenRa.Game/Game.cs
@@ -23,17 +23,17 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
-using OpenRa.FileFormats;
-using OpenRa.GameRules;
-using OpenRa.Graphics;
-using OpenRa.Network;
-using OpenRa.Support;
-using OpenRa.Traits;
-using Timer = OpenRa.Support.Timer;
+using OpenRA.FileFormats;
+using OpenRA.GameRules;
+using OpenRA.Graphics;
+using OpenRA.Network;
+using OpenRA.Support;
+using OpenRA.Traits;
+using Timer = OpenRA.Support.Timer;
 using System.Runtime.InteropServices;
 using System.IO;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public static class Game
 	{
diff --git a/OpenRa.Game/GameRules/ActorInfo.cs b/OpenRa.Game/GameRules/ActorInfo.cs
index 2376819f9b..d35890d849 100644
--- a/OpenRa.Game/GameRules/ActorInfo.cs
+++ b/OpenRa.Game/GameRules/ActorInfo.cs
@@ -23,10 +23,10 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Reflection;
-using OpenRa.FileFormats;
-using OpenRa.Traits;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
 
-namespace OpenRa.GameRules
+namespace OpenRA.GameRules
 {
 	public class ActorInfo
 	{
diff --git a/OpenRa.Game/GameRules/Footprint.cs b/OpenRa.Game/GameRules/Footprint.cs
index 119cb733b4..739c92873d 100644
--- a/OpenRa.Game/GameRules/Footprint.cs
+++ b/OpenRa.Game/GameRules/Footprint.cs
@@ -21,9 +21,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.GameRules
+namespace OpenRA.GameRules
 {
 	static class Footprint
 	{
diff --git a/OpenRa.Game/GameRules/GeneralInfo.cs b/OpenRa.Game/GameRules/GeneralInfo.cs
index 02fd25a713..4a6321e6d8 100644
--- a/OpenRa.Game/GameRules/GeneralInfo.cs
+++ b/OpenRa.Game/GameRules/GeneralInfo.cs
@@ -20,7 +20,7 @@
 
 using System;
 
-namespace OpenRa.GameRules
+namespace OpenRA.GameRules
 {
 	public class GeneralInfo
 	{
diff --git a/OpenRa.Game/GameRules/InfoLoader.cs b/OpenRa.Game/GameRules/InfoLoader.cs
index 6d67435ac7..e382db71ab 100644
--- a/OpenRa.Game/GameRules/InfoLoader.cs
+++ b/OpenRa.Game/GameRules/InfoLoader.cs
@@ -21,9 +21,9 @@
 using System;
 using System.Collections;
 using System.Collections.Generic;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa.GameRules
+namespace OpenRA.GameRules
 {
 	public class InfoLoader<T> : IEnumerable<KeyValuePair<string, T>>
 	{
diff --git a/OpenRa.Game/GameRules/ProjectileInfo.cs b/OpenRa.Game/GameRules/ProjectileInfo.cs
index 860dbc91b7..9ae57844d3 100644
--- a/OpenRa.Game/GameRules/ProjectileInfo.cs
+++ b/OpenRa.Game/GameRules/ProjectileInfo.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.GameRules
+namespace OpenRA.GameRules
 {
 	public class ProjectileInfo
 	{
diff --git a/OpenRa.Game/GameRules/Rules.cs b/OpenRa.Game/GameRules/Rules.cs
index 6e5249be1f..4f165c020e 100755
--- a/OpenRa.Game/GameRules/Rules.cs
+++ b/OpenRa.Game/GameRules/Rules.cs
@@ -21,10 +21,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.FileFormats;
-using OpenRa.GameRules;
+using OpenRA.FileFormats;
+using OpenRA.GameRules;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public static class Rules
 	{
diff --git a/OpenRa.Game/GameRules/TechTree.cs b/OpenRa.Game/GameRules/TechTree.cs
index 659e9af948..2bb0cfcb5f 100755
--- a/OpenRa.Game/GameRules/TechTree.cs
+++ b/OpenRa.Game/GameRules/TechTree.cs
@@ -20,10 +20,10 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.FileFormats;
-using OpenRa.Traits;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
 
-namespace OpenRa.GameRules
+namespace OpenRA.GameRules
 {
 	public class TechTree
 	{
diff --git a/OpenRa.Game/GameRules/UserSettings.cs b/OpenRa.Game/GameRules/UserSettings.cs
index 79c10cfc5c..dd5b1d26f8 100644
--- a/OpenRa.Game/GameRules/UserSettings.cs
+++ b/OpenRa.Game/GameRules/UserSettings.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.GameRules
+namespace OpenRA.GameRules
 {
 	public class UserSettings
 	{
diff --git a/OpenRa.Game/GameRules/VoiceInfo.cs b/OpenRa.Game/GameRules/VoiceInfo.cs
index 1578e9fb9d..fbe335f44e 100644
--- a/OpenRa.Game/GameRules/VoiceInfo.cs
+++ b/OpenRa.Game/GameRules/VoiceInfo.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa.GameRules
+namespace OpenRA.GameRules
 {
 	public class VoiceInfo
 	{
diff --git a/OpenRa.Game/GameRules/WarheadInfo.cs b/OpenRa.Game/GameRules/WarheadInfo.cs
index 705a235545..dc41fd0064 100644
--- a/OpenRa.Game/GameRules/WarheadInfo.cs
+++ b/OpenRa.Game/GameRules/WarheadInfo.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.GameRules
+namespace OpenRA.GameRules
 {
 	public class WarheadInfo
 	{
diff --git a/OpenRa.Game/GameRules/WeaponInfo.cs b/OpenRa.Game/GameRules/WeaponInfo.cs
index 2d15b6aca4..4e893d7d38 100755
--- a/OpenRa.Game/GameRules/WeaponInfo.cs
+++ b/OpenRa.Game/GameRules/WeaponInfo.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.GameRules
+namespace OpenRA.GameRules
 {
 	public class WeaponInfo
 	{
diff --git a/OpenRa.Game/Graphics/Animation.cs b/OpenRa.Game/Graphics/Animation.cs
index cf86a0ba07..910d3219fe 100644
--- a/OpenRa.Game/Graphics/Animation.cs
+++ b/OpenRa.Game/Graphics/Animation.cs
@@ -20,7 +20,7 @@
 
 using System;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	public class Animation
 	{
diff --git a/OpenRa.Game/Graphics/ChromeProvider.cs b/OpenRa.Game/Graphics/ChromeProvider.cs
index 4de9c493b7..8f5d18ef30 100644
--- a/OpenRa.Game/Graphics/ChromeProvider.cs
+++ b/OpenRa.Game/Graphics/ChromeProvider.cs
@@ -22,9 +22,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	static class ChromeProvider
 	{
diff --git a/OpenRa.Game/Graphics/CursorSequence.cs b/OpenRa.Game/Graphics/CursorSequence.cs
index 1343f955a1..1b851d7a60 100644
--- a/OpenRa.Game/Graphics/CursorSequence.cs
+++ b/OpenRa.Game/Graphics/CursorSequence.cs
@@ -20,7 +20,7 @@
 
 using System.Xml;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	class CursorSequence
 	{
diff --git a/OpenRa.Game/Graphics/CursorSheetBuilder.cs b/OpenRa.Game/Graphics/CursorSheetBuilder.cs
index 94e726d4a6..3bcdbb496d 100644
--- a/OpenRa.Game/Graphics/CursorSheetBuilder.cs
+++ b/OpenRa.Game/Graphics/CursorSheetBuilder.cs
@@ -20,9 +20,9 @@
 
 using System;
 using System.Linq;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	static class CursorSheetBuilder
 	{
diff --git a/OpenRa.Game/Graphics/HardwarePalette.cs b/OpenRa.Game/Graphics/HardwarePalette.cs
index 3317828581..440d284731 100644
--- a/OpenRa.Game/Graphics/HardwarePalette.cs
+++ b/OpenRa.Game/Graphics/HardwarePalette.cs
@@ -21,10 +21,10 @@
 using System;
 using System.Collections.Generic;
 using System.Drawing;
-using OpenRa.FileFormats;
-using OpenRa.Traits;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	class HardwarePalette : Sheet
 	{
diff --git a/OpenRa.Game/Graphics/LineRenderer.cs b/OpenRa.Game/Graphics/LineRenderer.cs
index 7df2e4274c..bb5ee7d01b 100644
--- a/OpenRa.Game/Graphics/LineRenderer.cs
+++ b/OpenRa.Game/Graphics/LineRenderer.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System.Drawing;
-using OpenRa.FileFormats.Graphics;
+using OpenRA.FileFormats.Graphics;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	class LineRenderer
 	{
diff --git a/OpenRa.Game/Graphics/MappedImage.cs b/OpenRa.Game/Graphics/MappedImage.cs
index 9ea3c43cba..a54767ddc8 100644
--- a/OpenRa.Game/Graphics/MappedImage.cs
+++ b/OpenRa.Game/Graphics/MappedImage.cs
@@ -22,7 +22,7 @@ using System.Drawing;
 using System.IO;
 using System.Xml;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	class MappedImage
 	{
diff --git a/OpenRa.Game/Graphics/Minimap.cs b/OpenRa.Game/Graphics/Minimap.cs
index 5ebf778636..f9adfa55df 100644
--- a/OpenRa.Game/Graphics/Minimap.cs
+++ b/OpenRa.Game/Graphics/Minimap.cs
@@ -22,10 +22,10 @@ using System;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.Linq;
-using OpenRa.FileFormats;
-using OpenRa.Traits;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	class Minimap
 	{
diff --git a/OpenRa.Game/Graphics/OverlayRenderer.cs b/OpenRa.Game/Graphics/OverlayRenderer.cs
index 71d8b9e322..cf56db58b5 100755
--- a/OpenRa.Game/Graphics/OverlayRenderer.cs
+++ b/OpenRa.Game/Graphics/OverlayRenderer.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System.Linq;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	class OverlayRenderer
 	{
diff --git a/OpenRa.Game/Graphics/Renderer.cs b/OpenRa.Game/Graphics/Renderer.cs
index 9a23670968..3e473aa151 100644
--- a/OpenRa.Game/Graphics/Renderer.cs
+++ b/OpenRa.Game/Graphics/Renderer.cs
@@ -23,12 +23,12 @@ using System.Drawing;
 using System.Drawing.Text;
 using System.Reflection;
 using System.Windows.Forms;
-using OpenRa.FileFormats;
-using OpenRa.FileFormats.Graphics;
-using OpenRa.Support;
+using OpenRA.FileFormats;
+using OpenRA.FileFormats.Graphics;
+using OpenRA.Support;
 using System.IO;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	internal class Renderer
 	{
diff --git a/OpenRa.Game/Graphics/Sequence.cs b/OpenRa.Game/Graphics/Sequence.cs
index 94e6e14a7c..07fbbab816 100644
--- a/OpenRa.Game/Graphics/Sequence.cs
+++ b/OpenRa.Game/Graphics/Sequence.cs
@@ -20,7 +20,7 @@
 
 using System.Xml;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	public class Sequence
 	{
diff --git a/OpenRa.Game/Graphics/SequenceProvider.cs b/OpenRa.Game/Graphics/SequenceProvider.cs
index 770f91bb91..e23153074b 100644
--- a/OpenRa.Game/Graphics/SequenceProvider.cs
+++ b/OpenRa.Game/Graphics/SequenceProvider.cs
@@ -22,9 +22,9 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using System.Xml;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	static class SequenceProvider
 	{
diff --git a/OpenRa.Game/Graphics/Sheet.cs b/OpenRa.Game/Graphics/Sheet.cs
index 6feb2bd0aa..f0f0934b83 100644
--- a/OpenRa.Game/Graphics/Sheet.cs
+++ b/OpenRa.Game/Graphics/Sheet.cs
@@ -19,10 +19,10 @@
 #endregion
 
 using System.Drawing;
-using OpenRa.FileFormats;
-using OpenRa.FileFormats.Graphics;
+using OpenRA.FileFormats;
+using OpenRA.FileFormats.Graphics;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	public class Sheet
 	{
diff --git a/OpenRa.Game/Graphics/SheetBuilder.cs b/OpenRa.Game/Graphics/SheetBuilder.cs
index f47504d3e2..7462490ee9 100644
--- a/OpenRa.Game/Graphics/SheetBuilder.cs
+++ b/OpenRa.Game/Graphics/SheetBuilder.cs
@@ -20,7 +20,7 @@
 
 using System.Drawing;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	class SheetBuilder
 	{
diff --git a/OpenRa.Game/Graphics/Sprite.cs b/OpenRa.Game/Graphics/Sprite.cs
index c947d9e212..0b9fa7cf4f 100644
--- a/OpenRa.Game/Graphics/Sprite.cs
+++ b/OpenRa.Game/Graphics/Sprite.cs
@@ -20,7 +20,7 @@
 
 using System.Drawing;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	public class Sprite
 	{
diff --git a/OpenRa.Game/Graphics/SpriteFont.cs b/OpenRa.Game/Graphics/SpriteFont.cs
index 2f542269eb..1977137ac9 100644
--- a/OpenRa.Game/Graphics/SpriteFont.cs
+++ b/OpenRa.Game/Graphics/SpriteFont.cs
@@ -1,11 +1,11 @@
 using System;
 using System.Drawing;
 using System.Linq;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 using Tao.FreeType;
 using System.Runtime.InteropServices;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	class SpriteFont
 	{
diff --git a/OpenRa.Game/Graphics/SpriteRenderer.cs b/OpenRa.Game/Graphics/SpriteRenderer.cs
index 7a03c207d6..d3222391b2 100644
--- a/OpenRa.Game/Graphics/SpriteRenderer.cs
+++ b/OpenRa.Game/Graphics/SpriteRenderer.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.FileFormats.Graphics;
+using OpenRA.FileFormats.Graphics;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	class SpriteRenderer
 	{
diff --git a/OpenRa.Game/Graphics/SpriteSheetBuilder.cs b/OpenRa.Game/Graphics/SpriteSheetBuilder.cs
index d02a47d6f3..e6780c5a0e 100644
--- a/OpenRa.Game/Graphics/SpriteSheetBuilder.cs
+++ b/OpenRa.Game/Graphics/SpriteSheetBuilder.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System.Linq;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	static class SpriteSheetBuilder
 	{
diff --git a/OpenRa.Game/Graphics/TerrainRenderer.cs b/OpenRa.Game/Graphics/TerrainRenderer.cs
index 85b0a98e58..17d9e9f490 100644
--- a/OpenRa.Game/Graphics/TerrainRenderer.cs
+++ b/OpenRa.Game/Graphics/TerrainRenderer.cs
@@ -19,10 +19,10 @@
 #endregion
 
 using System.Drawing;
-using OpenRa.FileFormats;
-using OpenRa.FileFormats.Graphics;
+using OpenRA.FileFormats;
+using OpenRA.FileFormats.Graphics;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	class TerrainRenderer
 	{
diff --git a/OpenRa.Game/Graphics/Util.cs b/OpenRa.Game/Graphics/Util.cs
index 74c340e33a..dfd873c2d4 100644
--- a/OpenRa.Game/Graphics/Util.cs
+++ b/OpenRa.Game/Graphics/Util.cs
@@ -23,9 +23,9 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Drawing.Imaging;
 using System.IO;
-using OpenRa.FileFormats.Graphics;
+using OpenRA.FileFormats.Graphics;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	static class Util
 	{
diff --git a/OpenRa.Game/Graphics/Viewport.cs b/OpenRa.Game/Graphics/Viewport.cs
index ebab7174d2..ba235b448e 100644
--- a/OpenRa.Game/Graphics/Viewport.cs
+++ b/OpenRa.Game/Graphics/Viewport.cs
@@ -20,10 +20,10 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Network;
-using OpenRa.Traits;
+using OpenRA.Network;
+using OpenRA.Traits;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	interface IHandleInput
 	{
diff --git a/OpenRa.Game/Graphics/WorldRenderer.cs b/OpenRa.Game/Graphics/WorldRenderer.cs
index 77a270fe84..2f17e32a09 100644
--- a/OpenRa.Game/Graphics/WorldRenderer.cs
+++ b/OpenRa.Game/Graphics/WorldRenderer.cs
@@ -21,10 +21,10 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRa.FileFormats;
-using OpenRa.Traits;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
 
-namespace OpenRa.Graphics
+namespace OpenRA.Graphics
 {
 	public class WorldRenderer
 	{
diff --git a/OpenRa.Game/MainWindow.cs b/OpenRa.Game/MainWindow.cs
index 63d11db1fc..c3ed7f0033 100755
--- a/OpenRa.Game/MainWindow.cs
+++ b/OpenRa.Game/MainWindow.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Windows.Forms;
 
-namespace OpenRa
+namespace OpenRA
 {
 	[Flags]
 	public enum MouseButton
diff --git a/OpenRa.Game/Network/Connection.cs b/OpenRa.Game/Network/Connection.cs
index 7b4d223f56..a6b3533bc0 100755
--- a/OpenRa.Game/Network/Connection.cs
+++ b/OpenRa.Game/Network/Connection.cs
@@ -23,9 +23,9 @@ using System.Collections.Generic;
 using System.IO;
 using System.Net.Sockets;
 using System.Threading;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa.Network
+namespace OpenRA.Network
 {
 	enum ConnectionState
 	{
diff --git a/OpenRa.Game/Network/Order.cs b/OpenRa.Game/Network/Order.cs
index f928ed0fcd..cf0dad188c 100755
--- a/OpenRa.Game/Network/Order.cs
+++ b/OpenRa.Game/Network/Order.cs
@@ -22,7 +22,7 @@ using System;
 using System.IO;
 using System.Linq;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public sealed class Order
 	{
diff --git a/OpenRa.Game/Network/OrderIO.cs b/OpenRa.Game/Network/OrderIO.cs
index 9b537b7a55..6b01dde077 100755
--- a/OpenRa.Game/Network/OrderIO.cs
+++ b/OpenRa.Game/Network/OrderIO.cs
@@ -23,7 +23,7 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 
-namespace OpenRa.Network
+namespace OpenRA.Network
 {
 	static class OrderIO
 	{
diff --git a/OpenRa.Game/Network/OrderManager.cs b/OpenRa.Game/Network/OrderManager.cs
index a6cafd22e7..a55772f15a 100755
--- a/OpenRa.Game/Network/OrderManager.cs
+++ b/OpenRa.Game/Network/OrderManager.cs
@@ -22,9 +22,9 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa.Network
+namespace OpenRA.Network
 {
 	class OrderManager
 	{
diff --git a/OpenRa.Game/Network/UnitOrders.cs b/OpenRa.Game/Network/UnitOrders.cs
index 268fb5751b..15c9e64019 100755
--- a/OpenRa.Game/Network/UnitOrders.cs
+++ b/OpenRa.Game/Network/UnitOrders.cs
@@ -20,9 +20,9 @@
 
 using System.Drawing;
 using System.Linq;
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.Network
+namespace OpenRA.Network
 {
 	static class UnitOrders
 	{
diff --git a/OpenRa.Game/OpenRa.Game.csproj b/OpenRa.Game/OpenRa.Game.csproj
index 9fa69e1eff..005993e077 100644
--- a/OpenRa.Game/OpenRa.Game.csproj
+++ b/OpenRa.Game/OpenRa.Game.csproj
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <Project DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003" ToolsVersion="3.5">
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -8,8 +8,8 @@
     <ProjectGuid>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</ProjectGuid>
     <OutputType>WinExe</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRa</RootNamespace>
-    <AssemblyName>OpenRa.Game</AssemblyName>
+    <RootNamespace>OpenRA</RootNamespace>
+    <AssemblyName>OpenRA.Game</AssemblyName>
     <FileUpgradeFlags>
     </FileUpgradeFlags>
     <OldToolsVersion>2.0</OldToolsVersion>
@@ -270,9 +270,9 @@
     <Compile Include="Traits\World\ScreenShaker.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OpenRa.FileFormats\OpenRa.FileFormats.csproj">
+    <ProjectReference Include="..\OpenRa.FileFormats\OpenRA.FileFormats.csproj">
       <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
-      <Name>OpenRa.FileFormats</Name>
+      <Name>OpenRA.FileFormats</Name>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
@@ -303,4 +303,4 @@
   <Target Name="AfterBuild">
   </Target>
   -->
-</Project>
+</Project>
\ No newline at end of file
diff --git a/OpenRa.Game/Orders/IOrderGenerator.cs b/OpenRa.Game/Orders/IOrderGenerator.cs
index f552f07cfa..e6259232a1 100644
--- a/OpenRa.Game/Orders/IOrderGenerator.cs
+++ b/OpenRa.Game/Orders/IOrderGenerator.cs
@@ -20,7 +20,7 @@
 
 using System.Collections.Generic;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public interface IOrderGenerator
 	{
diff --git a/OpenRa.Game/Orders/PlaceBuildingOrderGenerator.cs b/OpenRa.Game/Orders/PlaceBuildingOrderGenerator.cs
index acd1608140..42dc5884cf 100644
--- a/OpenRa.Game/Orders/PlaceBuildingOrderGenerator.cs
+++ b/OpenRa.Game/Orders/PlaceBuildingOrderGenerator.cs
@@ -19,10 +19,10 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.GameRules;
-using OpenRa.Traits;
+using OpenRA.GameRules;
+using OpenRA.Traits;
 
-namespace OpenRa.Orders
+namespace OpenRA.Orders
 {
 	class PlaceBuildingOrderGenerator : IOrderGenerator
 	{
diff --git a/OpenRa.Game/Orders/PowerDownOrderGenerator.cs b/OpenRa.Game/Orders/PowerDownOrderGenerator.cs
index eb963c9431..7bc750e364 100644
--- a/OpenRa.Game/Orders/PowerDownOrderGenerator.cs
+++ b/OpenRa.Game/Orders/PowerDownOrderGenerator.cs
@@ -20,9 +20,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.Orders
+namespace OpenRA.Orders
 {
 	class PowerDownOrderGenerator : IOrderGenerator
 	{
diff --git a/OpenRa.Game/Orders/RepairOrderGenerator.cs b/OpenRa.Game/Orders/RepairOrderGenerator.cs
index 4257dc82e1..31a8d0b561 100644
--- a/OpenRa.Game/Orders/RepairOrderGenerator.cs
+++ b/OpenRa.Game/Orders/RepairOrderGenerator.cs
@@ -20,9 +20,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.Orders
+namespace OpenRA.Orders
 {
 	class RepairOrderGenerator : IOrderGenerator
 	{
diff --git a/OpenRa.Game/Orders/SellOrderGenerator.cs b/OpenRa.Game/Orders/SellOrderGenerator.cs
index 1b67a5e27f..1a92bd3346 100644
--- a/OpenRa.Game/Orders/SellOrderGenerator.cs
+++ b/OpenRa.Game/Orders/SellOrderGenerator.cs
@@ -20,9 +20,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.Orders
+namespace OpenRA.Orders
 {
 	class SellOrderGenerator : IOrderGenerator
 	{
diff --git a/OpenRa.Game/Orders/UnitOrderGenerator.cs b/OpenRa.Game/Orders/UnitOrderGenerator.cs
index 99a5e86151..b3252348b5 100644
--- a/OpenRa.Game/Orders/UnitOrderGenerator.cs
+++ b/OpenRa.Game/Orders/UnitOrderGenerator.cs
@@ -21,9 +21,9 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.Orders
+namespace OpenRA.Orders
 {
 	class UnitOrderGenerator : IOrderGenerator
 	{
diff --git a/OpenRa.Game/Ore.cs b/OpenRa.Game/Ore.cs
index d89668f234..0fe76526c3 100644
--- a/OpenRa.Game/Ore.cs
+++ b/OpenRa.Game/Ore.cs
@@ -19,10 +19,10 @@
 #endregion
 
 using System;
-using OpenRa.FileFormats;
-using OpenRa.Traits;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public static class Ore
 	{
diff --git a/OpenRa.Game/PackageDownloader.cs b/OpenRa.Game/PackageDownloader.cs
index f10fe41234..1752639808 100644
--- a/OpenRa.Game/PackageDownloader.cs
+++ b/OpenRa.Game/PackageDownloader.cs
@@ -24,9 +24,9 @@ using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Security.Cryptography;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa
+namespace OpenRA
 {
 	static class PackageDownloader
 	{
diff --git a/OpenRa.Game/PathFinder.cs b/OpenRa.Game/PathFinder.cs
index 3c6f4a0319..0540c6ea59 100644
--- a/OpenRa.Game/PathFinder.cs
+++ b/OpenRa.Game/PathFinder.cs
@@ -22,10 +22,10 @@ using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
-using OpenRa.Support;
-using OpenRa.Traits;
+using OpenRA.Support;
+using OpenRA.Traits;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public class PathFinder
 	{
diff --git a/OpenRa.Game/PathSearch.cs b/OpenRa.Game/PathSearch.cs
index 7ddb1cfbae..24806e1d51 100755
--- a/OpenRa.Game/PathSearch.cs
+++ b/OpenRa.Game/PathSearch.cs
@@ -21,10 +21,10 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.FileFormats;
-using OpenRa.Traits;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public class PathSearch
 	{
diff --git a/OpenRa.Game/Player.cs b/OpenRa.Game/Player.cs
index d3d7d77ea7..a8488ab323 100644
--- a/OpenRa.Game/Player.cs
+++ b/OpenRa.Game/Player.cs
@@ -22,10 +22,10 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRa.FileFormats;
-using OpenRa.Traits;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public enum PowerState { Normal, Low, Critical };
 
diff --git a/OpenRa.Game/Selection.cs b/OpenRa.Game/Selection.cs
index 25b4626410..60c6274613 100644
--- a/OpenRa.Game/Selection.cs
+++ b/OpenRa.Game/Selection.cs
@@ -20,10 +20,10 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.FileFormats;
-using OpenRa.Traits;
+using OpenRA.FileFormats;
+using OpenRA.Traits;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public class Selection
 	{
diff --git a/OpenRa.Game/Shroud.cs b/OpenRa.Game/Shroud.cs
index 6df1da4dc4..7291d3c359 100644
--- a/OpenRa.Game/Shroud.cs
+++ b/OpenRa.Game/Shroud.cs
@@ -21,12 +21,12 @@
 using System;
 using System.Drawing;
 using System.Linq;
-using OpenRa.FileFormats;
-using OpenRa.GameRules;
-using OpenRa.Graphics;
-using OpenRa.Traits;
+using OpenRA.FileFormats;
+using OpenRA.GameRules;
+using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public class Shroud
 	{
diff --git a/OpenRa.Game/Smudge.cs b/OpenRa.Game/Smudge.cs
index ffb02ed4dc..952b18a864 100644
--- a/OpenRa.Game/Smudge.cs
+++ b/OpenRa.Game/Smudge.cs
@@ -18,10 +18,10 @@
  */
 #endregion
 
-using OpenRa.FileFormats;
-using OpenRa.GameRules;
+using OpenRA.FileFormats;
+using OpenRA.GameRules;
 
-namespace OpenRa
+namespace OpenRA
 {
 	static class Smudge
 	{
diff --git a/OpenRa.Game/Sound.cs b/OpenRa.Game/Sound.cs
index ac34d12bcc..044fcef768 100644
--- a/OpenRa.Game/Sound.cs
+++ b/OpenRa.Game/Sound.cs
@@ -20,12 +20,12 @@
 
 using System;
 using System.Collections.Generic;
-using OpenRa.FileFormats;
-using OpenRa.Support;
-using OpenRa.Traits;
+using OpenRA.FileFormats;
+using OpenRA.Support;
+using OpenRA.Traits;
 using Tao.OpenAl;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public static class Sound
 	{
diff --git a/OpenRa.Game/Support/PerfHistory.cs b/OpenRa.Game/Support/PerfHistory.cs
index f2e081b96e..0eb8e86587 100644
--- a/OpenRa.Game/Support/PerfHistory.cs
+++ b/OpenRa.Game/Support/PerfHistory.cs
@@ -22,10 +22,10 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRa.FileFormats;
-using OpenRa.Graphics;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
 
-namespace OpenRa.Support
+namespace OpenRA.Support
 {
 	static class PerfHistory
 	{
diff --git a/OpenRa.Game/Support/Program.cs b/OpenRa.Game/Support/Program.cs
index 7cd81c0f00..d8e31513e5 100644
--- a/OpenRa.Game/Support/Program.cs
+++ b/OpenRa.Game/Support/Program.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Diagnostics;
 
-namespace OpenRa
+namespace OpenRA
 {
 	static class Program
 	{
diff --git a/OpenRa.Game/Support/Settings.cs b/OpenRa.Game/Support/Settings.cs
index 2f47130034..92c8019390 100644
--- a/OpenRa.Game/Support/Settings.cs
+++ b/OpenRa.Game/Support/Settings.cs
@@ -21,7 +21,7 @@
 using System.Collections.Generic;
 using System.Text.RegularExpressions;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public class Settings
 	{
diff --git a/OpenRa.Game/Sync.cs b/OpenRa.Game/Sync.cs
index de2706f577..1914d2ded5 100755
--- a/OpenRa.Game/Sync.cs
+++ b/OpenRa.Game/Sync.cs
@@ -22,9 +22,9 @@ using System;
 using System.Linq;
 using System.Reflection;
 using System.Reflection.Emit;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public class SyncAttribute : Attribute { }
 
diff --git a/OpenRa.Game/TerrainCosts.cs b/OpenRa.Game/TerrainCosts.cs
index d8d6b9795e..d325cfc06f 100644
--- a/OpenRa.Game/TerrainCosts.cs
+++ b/OpenRa.Game/TerrainCosts.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.Graphics;
+using OpenRA.Graphics;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public enum UnitMovementType : byte
 	{
diff --git a/OpenRa.Game/Traits/AI/AutoHeal.cs b/OpenRa.Game/Traits/AI/AutoHeal.cs
index a50595da16..34e035e87a 100644
--- a/OpenRa.Game/Traits/AI/AutoHeal.cs
+++ b/OpenRa.Game/Traits/AI/AutoHeal.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System.Linq;
-using OpenRa.Traits.Activities;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class AutoHealInfo : StatelessTraitInfo<AutoHeal> { }
 
diff --git a/OpenRa.Game/Traits/AI/AutoTarget.cs b/OpenRa.Game/Traits/AI/AutoTarget.cs
index d5bf63e83a..e8ada3ea56 100644
--- a/OpenRa.Game/Traits/AI/AutoTarget.cs
+++ b/OpenRa.Game/Traits/AI/AutoTarget.cs
@@ -20,7 +20,7 @@
 
 using System.Linq;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class AutoTargetInfo : StatelessTraitInfo<AutoTarget> { }
 
diff --git a/OpenRa.Game/Traits/AI/SelfHealing.cs b/OpenRa.Game/Traits/AI/SelfHealing.cs
index 74a6bd486b..fb65a9969b 100644
--- a/OpenRa.Game/Traits/AI/SelfHealing.cs
+++ b/OpenRa.Game/Traits/AI/SelfHealing.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class SelfHealingInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/AI/TakeCover.cs b/OpenRa.Game/Traits/AI/TakeCover.cs
index e12be819bd..f906225a3d 100644
--- a/OpenRa.Game/Traits/AI/TakeCover.cs
+++ b/OpenRa.Game/Traits/AI/TakeCover.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class TakeCoverInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Activities/Attack.cs b/OpenRa.Game/Traits/Activities/Attack.cs
index cd714e58f7..817dc29c67 100644
--- a/OpenRa.Game/Traits/Activities/Attack.cs
+++ b/OpenRa.Game/Traits/Activities/Attack.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	/* non-turreted attack */
 	class Attack : IActivity
diff --git a/OpenRa.Game/Traits/Activities/CallFunc.cs b/OpenRa.Game/Traits/Activities/CallFunc.cs
index 1c6d463e5b..51e5ffd5bc 100644
--- a/OpenRa.Game/Traits/Activities/CallFunc.cs
+++ b/OpenRa.Game/Traits/Activities/CallFunc.cs
@@ -20,7 +20,7 @@
 
 using System;
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	public class CallFunc : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/DeliverOre.cs b/OpenRa.Game/Traits/Activities/DeliverOre.cs
index f165535e84..1656c7125e 100644
--- a/OpenRa.Game/Traits/Activities/DeliverOre.cs
+++ b/OpenRa.Game/Traits/Activities/DeliverOre.cs
@@ -20,7 +20,7 @@
 
 using System.Linq;
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	public class DeliverOre : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/EnterTransport.cs b/OpenRa.Game/Traits/Activities/EnterTransport.cs
index c29aff5869..38bf1fd3d4 100644
--- a/OpenRa.Game/Traits/Activities/EnterTransport.cs
+++ b/OpenRa.Game/Traits/Activities/EnterTransport.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	class EnterTransport : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/Fly.cs b/OpenRa.Game/Traits/Activities/Fly.cs
index 2617a8edd4..05d2b61c7e 100644
--- a/OpenRa.Game/Traits/Activities/Fly.cs
+++ b/OpenRa.Game/Traits/Activities/Fly.cs
@@ -20,7 +20,7 @@
 
 using System;
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	public class Fly : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/FlyAttack.cs b/OpenRa.Game/Traits/Activities/FlyAttack.cs
index ddb21ec45d..4444d7b8d5 100644
--- a/OpenRa.Game/Traits/Activities/FlyAttack.cs
+++ b/OpenRa.Game/Traits/Activities/FlyAttack.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	public class FlyAttack : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/FlyTimed.cs b/OpenRa.Game/Traits/Activities/FlyTimed.cs
index f215e9150c..5eacbb59ad 100644
--- a/OpenRa.Game/Traits/Activities/FlyTimed.cs
+++ b/OpenRa.Game/Traits/Activities/FlyTimed.cs
@@ -20,7 +20,7 @@
 
 using System;
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	class FlyTimed : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/Follow.cs b/OpenRa.Game/Traits/Activities/Follow.cs
index 88e79a7779..ad04dbee8e 100644
--- a/OpenRa.Game/Traits/Activities/Follow.cs
+++ b/OpenRa.Game/Traits/Activities/Follow.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	class Follow : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/Harvest.cs b/OpenRa.Game/Traits/Activities/Harvest.cs
index 956380d491..568be61320 100644
--- a/OpenRa.Game/Traits/Activities/Harvest.cs
+++ b/OpenRa.Game/Traits/Activities/Harvest.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	public class Harvest : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/HeliAttack.cs b/OpenRa.Game/Traits/Activities/HeliAttack.cs
index 48911951ec..c7eb9618db 100644
--- a/OpenRa.Game/Traits/Activities/HeliAttack.cs
+++ b/OpenRa.Game/Traits/Activities/HeliAttack.cs
@@ -20,7 +20,7 @@
 
 using System;
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	class HeliAttack : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/HeliFly.cs b/OpenRa.Game/Traits/Activities/HeliFly.cs
index 7ddeaa2e7d..7e30bbf0ce 100644
--- a/OpenRa.Game/Traits/Activities/HeliFly.cs
+++ b/OpenRa.Game/Traits/Activities/HeliFly.cs
@@ -20,7 +20,7 @@
 
 using System;
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	class HeliFly : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/HeliLand.cs b/OpenRa.Game/Traits/Activities/HeliLand.cs
index 13d8246e03..2f5027ee2a 100644
--- a/OpenRa.Game/Traits/Activities/HeliLand.cs
+++ b/OpenRa.Game/Traits/Activities/HeliLand.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	class HeliLand : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/HeliReturn.cs b/OpenRa.Game/Traits/Activities/HeliReturn.cs
index 72c69e433f..629c230dfb 100644
--- a/OpenRa.Game/Traits/Activities/HeliReturn.cs
+++ b/OpenRa.Game/Traits/Activities/HeliReturn.cs
@@ -20,7 +20,7 @@
 
 using System.Linq;
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	class HeliReturn : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/Idle.cs b/OpenRa.Game/Traits/Activities/Idle.cs
index fde67bc245..5d287ed7cd 100644
--- a/OpenRa.Game/Traits/Activities/Idle.cs
+++ b/OpenRa.Game/Traits/Activities/Idle.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	class Idle : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/Land.cs b/OpenRa.Game/Traits/Activities/Land.cs
index c7d9da14b8..77e411b8d3 100644
--- a/OpenRa.Game/Traits/Activities/Land.cs
+++ b/OpenRa.Game/Traits/Activities/Land.cs
@@ -20,7 +20,7 @@
 
 using System;
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	public class Land : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/Move.cs b/OpenRa.Game/Traits/Activities/Move.cs
index 619efb1a49..20ab3ddefc 100755
--- a/OpenRa.Game/Traits/Activities/Move.cs
+++ b/OpenRa.Game/Traits/Activities/Move.cs
@@ -23,7 +23,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	public class Move : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/Rearm.cs b/OpenRa.Game/Traits/Activities/Rearm.cs
index b70930da0c..36494215ba 100644
--- a/OpenRa.Game/Traits/Activities/Rearm.cs
+++ b/OpenRa.Game/Traits/Activities/Rearm.cs
@@ -20,7 +20,7 @@
 
 using System.Linq;
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	public class Rearm : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/RemoveSelf.cs b/OpenRa.Game/Traits/Activities/RemoveSelf.cs
index 74f81fe01f..fffbbe5f41 100644
--- a/OpenRa.Game/Traits/Activities/RemoveSelf.cs
+++ b/OpenRa.Game/Traits/Activities/RemoveSelf.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	public class RemoveSelf : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/Repair.cs b/OpenRa.Game/Traits/Activities/Repair.cs
index 44f68ccd5f..ec36aff0aa 100644
--- a/OpenRa.Game/Traits/Activities/Repair.cs
+++ b/OpenRa.Game/Traits/Activities/Repair.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Linq;
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	public class Repair : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/ReturnToBase.cs b/OpenRa.Game/Traits/Activities/ReturnToBase.cs
index 3525dbbe41..6d5befb87e 100644
--- a/OpenRa.Game/Traits/Activities/ReturnToBase.cs
+++ b/OpenRa.Game/Traits/Activities/ReturnToBase.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Linq;
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	class ReturnToBase : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/Sell.cs b/OpenRa.Game/Traits/Activities/Sell.cs
index 0c74d5cd07..159074ce19 100644
--- a/OpenRa.Game/Traits/Activities/Sell.cs
+++ b/OpenRa.Game/Traits/Activities/Sell.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	class Sell : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/Teleport.cs b/OpenRa.Game/Traits/Activities/Teleport.cs
index 1c81b8198e..b9be2715dd 100644
--- a/OpenRa.Game/Traits/Activities/Teleport.cs
+++ b/OpenRa.Game/Traits/Activities/Teleport.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	public class Teleport : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/TransformIntoActor.cs b/OpenRa.Game/Traits/Activities/TransformIntoActor.cs
index 3126d16d9c..5f9b193a4a 100644
--- a/OpenRa.Game/Traits/Activities/TransformIntoActor.cs
+++ b/OpenRa.Game/Traits/Activities/TransformIntoActor.cs
@@ -20,7 +20,7 @@
 
 using System;
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	class TransformIntoActor : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/Turn.cs b/OpenRa.Game/Traits/Activities/Turn.cs
index 8be70f5c19..4eac57a8c3 100755
--- a/OpenRa.Game/Traits/Activities/Turn.cs
+++ b/OpenRa.Game/Traits/Activities/Turn.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	public class Turn : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/UndeployMcv.cs b/OpenRa.Game/Traits/Activities/UndeployMcv.cs
index e3168be891..6e4255007f 100644
--- a/OpenRa.Game/Traits/Activities/UndeployMcv.cs
+++ b/OpenRa.Game/Traits/Activities/UndeployMcv.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System;
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	class UndeployMcv : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Activities/UnloadCargo.cs b/OpenRa.Game/Traits/Activities/UnloadCargo.cs
index a2318bbb20..f023ecf9eb 100644
--- a/OpenRa.Game/Traits/Activities/UnloadCargo.cs
+++ b/OpenRa.Game/Traits/Activities/UnloadCargo.cs
@@ -20,7 +20,7 @@
 
 using System.Linq;
 
-namespace OpenRa.Traits.Activities
+namespace OpenRA.Traits.Activities
 {
 	public class UnloadCargo : IActivity
 	{
diff --git a/OpenRa.Game/Traits/Attack/AttackBase.cs b/OpenRa.Game/Traits/Attack/AttackBase.cs
index 1814a0c78b..8208980c8b 100644
--- a/OpenRa.Game/Traits/Attack/AttackBase.cs
+++ b/OpenRa.Game/Traits/Attack/AttackBase.cs
@@ -22,10 +22,10 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRa.Effects;
-using OpenRa.FileFormats;
+using OpenRA.Effects;
+using OpenRA.FileFormats;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public class AttackBaseInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Attack/AttackFrontal.cs b/OpenRa.Game/Traits/Attack/AttackFrontal.cs
index 70b94e7e76..6c9f756ef2 100644
--- a/OpenRa.Game/Traits/Attack/AttackFrontal.cs
+++ b/OpenRa.Game/Traits/Attack/AttackFrontal.cs
@@ -20,7 +20,7 @@
 
 using System;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	abstract class AttackFrontal : AttackBase
 	{
diff --git a/OpenRa.Game/Traits/Attack/AttackHeli.cs b/OpenRa.Game/Traits/Attack/AttackHeli.cs
index e56ffc229b..430aaa8896 100644
--- a/OpenRa.Game/Traits/Attack/AttackHeli.cs
+++ b/OpenRa.Game/Traits/Attack/AttackHeli.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.Traits.Activities;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class AttackHeliInfo : AttackBaseInfo
 	{
diff --git a/OpenRa.Game/Traits/Attack/AttackInfo.cs b/OpenRa.Game/Traits/Attack/AttackInfo.cs
index ca2f6988ea..90cbdf2877 100644
--- a/OpenRa.Game/Traits/Attack/AttackInfo.cs
+++ b/OpenRa.Game/Traits/Attack/AttackInfo.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.GameRules;
+using OpenRA.GameRules;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public class AttackInfo
 	{
diff --git a/OpenRa.Game/Traits/Attack/AttackOmni.cs b/OpenRa.Game/Traits/Attack/AttackOmni.cs
index 695e76143e..d7d1abfc97 100644
--- a/OpenRa.Game/Traits/Attack/AttackOmni.cs
+++ b/OpenRa.Game/Traits/Attack/AttackOmni.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class AttackOmniInfo : AttackBaseInfo
 	{
diff --git a/OpenRa.Game/Traits/Attack/AttackPlane.cs b/OpenRa.Game/Traits/Attack/AttackPlane.cs
index 2b459f3835..dd91bd4308 100644
--- a/OpenRa.Game/Traits/Attack/AttackPlane.cs
+++ b/OpenRa.Game/Traits/Attack/AttackPlane.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.Traits.Activities;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class AttackPlaneInfo : AttackBaseInfo
 	{
diff --git a/OpenRa.Game/Traits/Attack/AttackTurreted.cs b/OpenRa.Game/Traits/Attack/AttackTurreted.cs
index 79a6262cb6..31387e459e 100644
--- a/OpenRa.Game/Traits/Attack/AttackTurreted.cs
+++ b/OpenRa.Game/Traits/Attack/AttackTurreted.cs
@@ -20,7 +20,7 @@
 
 using System;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class AttackTurretedInfo : AttackBaseInfo
 	{
diff --git a/OpenRa.Game/Traits/Bridge.cs b/OpenRa.Game/Traits/Bridge.cs
index dd769235d7..99dc12c52f 100644
--- a/OpenRa.Game/Traits/Bridge.cs
+++ b/OpenRa.Game/Traits/Bridge.cs
@@ -21,10 +21,10 @@
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRa.FileFormats;
-using OpenRa.Graphics;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class BridgeInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Buildable.cs b/OpenRa.Game/Traits/Buildable.cs
index c71a747ff3..2da02fd287 100755
--- a/OpenRa.Game/Traits/Buildable.cs
+++ b/OpenRa.Game/Traits/Buildable.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class BuildableInfo : StatelessTraitInfo<Buildable>
 	{
diff --git a/OpenRa.Game/Traits/Building.cs b/OpenRa.Game/Traits/Building.cs
index 13805c908a..3b07cabac5 100644
--- a/OpenRa.Game/Traits/Building.cs
+++ b/OpenRa.Game/Traits/Building.cs
@@ -21,11 +21,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Effects;
-using OpenRa.GameRules;
-using OpenRa.Traits.Activities;
+using OpenRA.Effects;
+using OpenRA.GameRules;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public class OwnedActorInfo
 	{
diff --git a/OpenRa.Game/Traits/CanPowerDown.cs b/OpenRa.Game/Traits/CanPowerDown.cs
index 29c979ec05..ef2b007d85 100644
--- a/OpenRa.Game/Traits/CanPowerDown.cs
+++ b/OpenRa.Game/Traits/CanPowerDown.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public class CanPowerDownInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Cargo.cs b/OpenRa.Game/Traits/Cargo.cs
index c29261de5b..4ff7606dcf 100644
--- a/OpenRa.Game/Traits/Cargo.cs
+++ b/OpenRa.Game/Traits/Cargo.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Traits.Activities;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public class CargoInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Chrome/PowerDownButton.cs b/OpenRa.Game/Traits/Chrome/PowerDownButton.cs
index c8fafdf6bd..09aa6d94fd 100644
--- a/OpenRa.Game/Traits/Chrome/PowerDownButton.cs
+++ b/OpenRa.Game/Traits/Chrome/PowerDownButton.cs
@@ -1,8 +1,8 @@
 using System;
 using System.Linq;
-using OpenRa.Orders;
+using OpenRA.Orders;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class PowerDownButtonInfo : StatelessTraitInfo<PowerDownButton> { }
 
diff --git a/OpenRa.Game/Traits/Chronoshiftable.cs b/OpenRa.Game/Traits/Chronoshiftable.cs
index dfdf99f7d6..ff6b84f66e 100644
--- a/OpenRa.Game/Traits/Chronoshiftable.cs
+++ b/OpenRa.Game/Traits/Chronoshiftable.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class ChronoshiftableInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/ConstructionYard.cs b/OpenRa.Game/Traits/ConstructionYard.cs
index c3b7d836fc..d2e737fb14 100644
--- a/OpenRa.Game/Traits/ConstructionYard.cs
+++ b/OpenRa.Game/Traits/ConstructionYard.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.Traits.Activities;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class ConstructionYardInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Crate.cs b/OpenRa.Game/Traits/Crate.cs
index 5ff8975adc..c3fbad0246 100644
--- a/OpenRa.Game/Traits/Crate.cs
+++ b/OpenRa.Game/Traits/Crate.cs
@@ -20,7 +20,7 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
 /*
  * Crates left to implement:
@@ -39,7 +39,7 @@ Invulnerability=3,INVULBOX,1.0  ; invulnerability (duration in minutes)
 TimeQuake=3,TQUAKE              ; time quake
 */
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class CrateInfo : ITraitInfo, ITraitPrerequisite<RenderSimpleInfo>
 	{
diff --git a/OpenRa.Game/Traits/CustomSellValue.cs b/OpenRa.Game/Traits/CustomSellValue.cs
index c8d65e8a7f..935f90be78 100644
--- a/OpenRa.Game/Traits/CustomSellValue.cs
+++ b/OpenRa.Game/Traits/CustomSellValue.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	// allow a nonstandard sell/repair value to avoid
 	// buy-sell exploits like c&c's PROC.
diff --git a/OpenRa.Game/Traits/Explodes.cs b/OpenRa.Game/Traits/Explodes.cs
index 9bb3172c69..061ba4d82d 100644
--- a/OpenRa.Game/Traits/Explodes.cs
+++ b/OpenRa.Game/Traits/Explodes.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.Effects;
+using OpenRA.Effects;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class ExplodesInfo : StatelessTraitInfo<Explodes> { }
 
diff --git a/OpenRa.Game/Traits/Fake.cs b/OpenRa.Game/Traits/Fake.cs
index a72b619b20..050d356fd5 100644
--- a/OpenRa.Game/Traits/Fake.cs
+++ b/OpenRa.Game/Traits/Fake.cs
@@ -20,7 +20,7 @@
 
 using System.Collections.Generic;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class FakeInfo : StatelessTraitInfo<Fake> { }
 
diff --git a/OpenRa.Game/Traits/GeneratesGap.cs b/OpenRa.Game/Traits/GeneratesGap.cs
index aa958e0764..3f8df84071 100644
--- a/OpenRa.Game/Traits/GeneratesGap.cs
+++ b/OpenRa.Game/Traits/GeneratesGap.cs
@@ -20,7 +20,7 @@
 
 using System.Collections.Generic;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class GeneratesGapInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Harvester.cs b/OpenRa.Game/Traits/Harvester.cs
index 319c5c9640..e476624178 100644
--- a/OpenRa.Game/Traits/Harvester.cs
+++ b/OpenRa.Game/Traits/Harvester.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Traits.Activities;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class HarvesterInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Helicopter.cs b/OpenRa.Game/Traits/Helicopter.cs
index 21e9cb24f0..3224a35e9c 100644
--- a/OpenRa.Game/Traits/Helicopter.cs
+++ b/OpenRa.Game/Traits/Helicopter.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System;
-using OpenRa.Traits.Activities;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class HelicopterInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/LimitedAmmo.cs b/OpenRa.Game/Traits/LimitedAmmo.cs
index f8a6ad36b3..cff63a57ea 100644
--- a/OpenRa.Game/Traits/LimitedAmmo.cs
+++ b/OpenRa.Game/Traits/LimitedAmmo.cs
@@ -20,7 +20,7 @@
 
 using System.Collections.Generic;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class LimitedAmmoInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Mobile.cs b/OpenRa.Game/Traits/Mobile.cs
index 6cb373778e..71e1c5b7d3 100644
--- a/OpenRa.Game/Traits/Mobile.cs
+++ b/OpenRa.Game/Traits/Mobile.cs
@@ -21,7 +21,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public class MobileInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Modifiers/BelowUnits.cs b/OpenRa.Game/Traits/Modifiers/BelowUnits.cs
index 3f47127b79..efa7abd4f5 100644
--- a/OpenRa.Game/Traits/Modifiers/BelowUnits.cs
+++ b/OpenRa.Game/Traits/Modifiers/BelowUnits.cs
@@ -21,7 +21,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class BelowUnitsInfo : StatelessTraitInfo<BelowUnits> { }
 
diff --git a/OpenRa.Game/Traits/Modifiers/Cloak.cs b/OpenRa.Game/Traits/Modifiers/Cloak.cs
index 37e61a9ea5..e60c041a43 100644
--- a/OpenRa.Game/Traits/Modifiers/Cloak.cs
+++ b/OpenRa.Game/Traits/Modifiers/Cloak.cs
@@ -21,7 +21,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class CloakInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Modifiers/InvisibleToOthers.cs b/OpenRa.Game/Traits/Modifiers/InvisibleToOthers.cs
index 1c56c90788..b2a44fde90 100644
--- a/OpenRa.Game/Traits/Modifiers/InvisibleToOthers.cs
+++ b/OpenRa.Game/Traits/Modifiers/InvisibleToOthers.cs
@@ -20,7 +20,7 @@
 
 using System.Collections.Generic;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class InvisibleToOthersInfo : StatelessTraitInfo<InvisibleToOthers> { }
 
diff --git a/OpenRa.Game/Traits/Modifiers/WithShadow.cs b/OpenRa.Game/Traits/Modifiers/WithShadow.cs
index 617bdda9bb..0540b26bfc 100644
--- a/OpenRa.Game/Traits/Modifiers/WithShadow.cs
+++ b/OpenRa.Game/Traits/Modifiers/WithShadow.cs
@@ -21,7 +21,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class WithShadowInfo : StatelessTraitInfo<WithShadow> {}
 
diff --git a/OpenRa.Game/Traits/OreRefinery.cs b/OpenRa.Game/Traits/OreRefinery.cs
index 4edcddf5e4..c118922e93 100644
--- a/OpenRa.Game/Traits/OreRefinery.cs
+++ b/OpenRa.Game/Traits/OreRefinery.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.Traits.Activities;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class OreRefineryInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Passenger.cs b/OpenRa.Game/Traits/Passenger.cs
index 5ca2a62c02..da8ac8f967 100644
--- a/OpenRa.Game/Traits/Passenger.cs
+++ b/OpenRa.Game/Traits/Passenger.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System.Linq;
-using OpenRa.Traits.Activities;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class PassengerInfo : StatelessTraitInfo<Passenger> {}
 
diff --git a/OpenRa.Game/Traits/Plane.cs b/OpenRa.Game/Traits/Plane.cs
index 2c48ca9515..cb09615e38 100644
--- a/OpenRa.Game/Traits/Plane.cs
+++ b/OpenRa.Game/Traits/Plane.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System;
-using OpenRa.Traits.Activities;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class PlaneInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Player/EvaAlerts.cs b/OpenRa.Game/Traits/Player/EvaAlerts.cs
index 6c1975ac7d..516a68b90e 100644
--- a/OpenRa.Game/Traits/Player/EvaAlerts.cs
+++ b/OpenRa.Game/Traits/Player/EvaAlerts.cs
@@ -19,7 +19,7 @@
 #endregion
 
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class EvaAlertsInfo : StatelessTraitInfo<EvaAlerts>
 	{
diff --git a/OpenRa.Game/Traits/Player/PlaceBuilding.cs b/OpenRa.Game/Traits/Player/PlaceBuilding.cs
index abca804d42..afd3142bfa 100644
--- a/OpenRa.Game/Traits/Player/PlaceBuilding.cs
+++ b/OpenRa.Game/Traits/Player/PlaceBuilding.cs
@@ -20,7 +20,7 @@
 
 using System.Linq;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class PlaceBuildingInfo : StatelessTraitInfo<PlaceBuilding> {}
 
diff --git a/OpenRa.Game/Traits/Player/ProductionQueue.cs b/OpenRa.Game/Traits/Player/ProductionQueue.cs
index 070bea1c85..1a58637d8f 100644
--- a/OpenRa.Game/Traits/Player/ProductionQueue.cs
+++ b/OpenRa.Game/Traits/Player/ProductionQueue.cs
@@ -21,9 +21,9 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class ProductionQueueInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Player/SpawnDefaultUnits.cs b/OpenRa.Game/Traits/Player/SpawnDefaultUnits.cs
index 140630d5da..8337424a9d 100644
--- a/OpenRa.Game/Traits/Player/SpawnDefaultUnits.cs
+++ b/OpenRa.Game/Traits/Player/SpawnDefaultUnits.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class SpawnDefaultUnitsInfo : StatelessTraitInfo<SpawnDefaultUnits> { }
 
diff --git a/OpenRa.Game/Traits/Production.cs b/OpenRa.Game/Traits/Production.cs
index 6544fea783..efe9b236e5 100755
--- a/OpenRa.Game/Traits/Production.cs
+++ b/OpenRa.Game/Traits/Production.cs
@@ -20,9 +20,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.GameRules;
+using OpenRA.GameRules;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public class ProductionInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/ProductionSurround.cs b/OpenRa.Game/Traits/ProductionSurround.cs
index 0ba78f9466..6a02267b7d 100644
--- a/OpenRa.Game/Traits/ProductionSurround.cs
+++ b/OpenRa.Game/Traits/ProductionSurround.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System.Linq;
-using OpenRa.GameRules;
+using OpenRA.GameRules;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class ProductionSurroundInfo : ProductionInfo
 	{
diff --git a/OpenRa.Game/Traits/ProvidesRadar.cs b/OpenRa.Game/Traits/ProvidesRadar.cs
index fc282ce542..e17656e54c 100644
--- a/OpenRa.Game/Traits/ProvidesRadar.cs
+++ b/OpenRa.Game/Traits/ProvidesRadar.cs
@@ -20,7 +20,7 @@
 
 using System.Linq;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class ProvidesRadarInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/RallyPoint.cs b/OpenRa.Game/Traits/RallyPoint.cs
index 50b9721622..a932ff4122 100644
--- a/OpenRa.Game/Traits/RallyPoint.cs
+++ b/OpenRa.Game/Traits/RallyPoint.cs
@@ -20,9 +20,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Graphics;
+using OpenRA.Graphics;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class RallyPointInfo : ITraitInfo, ITraitPrerequisite<RenderSimpleInfo>
 	{
diff --git a/OpenRa.Game/Traits/Render/RenderBuilding.cs b/OpenRa.Game/Traits/Render/RenderBuilding.cs
index 884d3fc178..78142dbf25 100644
--- a/OpenRa.Game/Traits/Render/RenderBuilding.cs
+++ b/OpenRa.Game/Traits/Render/RenderBuilding.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System;
-using OpenRa.Effects;
+using OpenRA.Effects;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public class RenderBuildingInfo : RenderSimpleInfo
 	{
diff --git a/OpenRa.Game/Traits/Render/RenderBuildingCharge.cs b/OpenRa.Game/Traits/Render/RenderBuildingCharge.cs
index 3414c089f5..fe3dc9e817 100644
--- a/OpenRa.Game/Traits/Render/RenderBuildingCharge.cs
+++ b/OpenRa.Game/Traits/Render/RenderBuildingCharge.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class RenderBuildingChargeInfo : RenderBuildingInfo
 	{
diff --git a/OpenRa.Game/Traits/Render/RenderBuildingOre.cs b/OpenRa.Game/Traits/Render/RenderBuildingOre.cs
index 6a24bedccd..b5381cc4c0 100644
--- a/OpenRa.Game/Traits/Render/RenderBuildingOre.cs
+++ b/OpenRa.Game/Traits/Render/RenderBuildingOre.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class RenderBuildingOreInfo : RenderBuildingInfo
 	{
diff --git a/OpenRa.Game/Traits/Render/RenderBuildingTurreted.cs b/OpenRa.Game/Traits/Render/RenderBuildingTurreted.cs
index 4e57a82519..bb031c1f97 100644
--- a/OpenRa.Game/Traits/Render/RenderBuildingTurreted.cs
+++ b/OpenRa.Game/Traits/Render/RenderBuildingTurreted.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class RenderBuildingTurretedInfo : RenderBuildingInfo
 	{
diff --git a/OpenRa.Game/Traits/Render/RenderBuildingWall.cs b/OpenRa.Game/Traits/Render/RenderBuildingWall.cs
index 6dd2daa1e1..bf27e730d3 100644
--- a/OpenRa.Game/Traits/Render/RenderBuildingWall.cs
+++ b/OpenRa.Game/Traits/Render/RenderBuildingWall.cs
@@ -20,7 +20,7 @@
 
 using System.Linq;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class RenderBuildingWallInfo : RenderBuildingInfo
 	{
diff --git a/OpenRa.Game/Traits/Render/RenderBuildingWarFactory.cs b/OpenRa.Game/Traits/Render/RenderBuildingWarFactory.cs
index 0e2a55f4d9..053ba3b9a3 100644
--- a/OpenRa.Game/Traits/Render/RenderBuildingWarFactory.cs
+++ b/OpenRa.Game/Traits/Render/RenderBuildingWarFactory.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System.Linq;
-using OpenRa.Graphics;
+using OpenRA.Graphics;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class RenderWarFactoryInfo : ITraitInfo, ITraitPrerequisite<RenderSimpleInfo>
 	{
diff --git a/OpenRa.Game/Traits/Render/RenderInfantry.cs b/OpenRa.Game/Traits/Render/RenderInfantry.cs
index 14d0bf26a4..f97107ea6c 100644
--- a/OpenRa.Game/Traits/Render/RenderInfantry.cs
+++ b/OpenRa.Game/Traits/Render/RenderInfantry.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.Effects;
+using OpenRA.Effects;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public class RenderInfantryInfo : RenderSimpleInfo
 	{
diff --git a/OpenRa.Game/Traits/Render/RenderSimple.cs b/OpenRa.Game/Traits/Render/RenderSimple.cs
index 596ade7bbc..f4d4793fa8 100644
--- a/OpenRa.Game/Traits/Render/RenderSimple.cs
+++ b/OpenRa.Game/Traits/Render/RenderSimple.cs
@@ -20,9 +20,9 @@
 
 using System;
 using System.Collections.Generic;
-using OpenRa.Graphics;
+using OpenRA.Graphics;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public abstract class RenderSimpleInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Render/RenderUnit.cs b/OpenRa.Game/Traits/Render/RenderUnit.cs
index 874fd7ad95..c766d0af8a 100644
--- a/OpenRa.Game/Traits/Render/RenderUnit.cs
+++ b/OpenRa.Game/Traits/Render/RenderUnit.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System;
-using OpenRa.Graphics;
+using OpenRA.Graphics;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class RenderUnitInfo : RenderSimpleInfo
 	{
diff --git a/OpenRa.Game/Traits/Render/RenderUnitMuzzleFlash.cs b/OpenRa.Game/Traits/Render/RenderUnitMuzzleFlash.cs
index ee2e2c31f8..00523dba80 100644
--- a/OpenRa.Game/Traits/Render/RenderUnitMuzzleFlash.cs
+++ b/OpenRa.Game/Traits/Render/RenderUnitMuzzleFlash.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.Graphics;
+using OpenRA.Graphics;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class RenderUnitMuzzleFlashInfo : RenderUnitInfo
 	{
diff --git a/OpenRa.Game/Traits/Render/RenderUnitReload.cs b/OpenRa.Game/Traits/Render/RenderUnitReload.cs
index 889a66eeb1..87c302a77d 100644
--- a/OpenRa.Game/Traits/Render/RenderUnitReload.cs
+++ b/OpenRa.Game/Traits/Render/RenderUnitReload.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class RenderUnitReloadInfo : RenderUnitInfo
 	{
diff --git a/OpenRa.Game/Traits/Render/RenderUnitRotor.cs b/OpenRa.Game/Traits/Render/RenderUnitRotor.cs
index 17f583848b..4b87691964 100644
--- a/OpenRa.Game/Traits/Render/RenderUnitRotor.cs
+++ b/OpenRa.Game/Traits/Render/RenderUnitRotor.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.Graphics;
+using OpenRA.Graphics;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class RenderUnitRotorInfo : RenderUnitInfo
 	{
diff --git a/OpenRa.Game/Traits/Render/RenderUnitSpinner.cs b/OpenRa.Game/Traits/Render/RenderUnitSpinner.cs
index ad0444062f..9f181354de 100644
--- a/OpenRa.Game/Traits/Render/RenderUnitSpinner.cs
+++ b/OpenRa.Game/Traits/Render/RenderUnitSpinner.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.Graphics;
+using OpenRA.Graphics;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class RenderUnitSpinnerInfo : RenderUnitInfo
 	{
diff --git a/OpenRa.Game/Traits/Render/RenderUnitTurreted.cs b/OpenRa.Game/Traits/Render/RenderUnitTurreted.cs
index 2d37a18450..af7ec971af 100644
--- a/OpenRa.Game/Traits/Render/RenderUnitTurreted.cs
+++ b/OpenRa.Game/Traits/Render/RenderUnitTurreted.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.Graphics;
+using OpenRA.Graphics;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class RenderUnitTurretedInfo : RenderUnitInfo
 	{
diff --git a/OpenRa.Game/Traits/Repairable.cs b/OpenRa.Game/Traits/Repairable.cs
index 077201788a..819ef65090 100644
--- a/OpenRa.Game/Traits/Repairable.cs
+++ b/OpenRa.Game/Traits/Repairable.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System;
-using OpenRa.Traits.Activities;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class RepairableInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Reservable.cs b/OpenRa.Game/Traits/Reservable.cs
index 62fabd6f00..6c52f580c2 100644
--- a/OpenRa.Game/Traits/Reservable.cs
+++ b/OpenRa.Game/Traits/Reservable.cs
@@ -20,7 +20,7 @@
 
 using System;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class ReservableInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/SeedsOre.cs b/OpenRa.Game/Traits/SeedsOre.cs
index e4b4c1c813..378b110789 100644
--- a/OpenRa.Game/Traits/SeedsOre.cs
+++ b/OpenRa.Game/Traits/SeedsOre.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class SeedsOreInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Selectable.cs b/OpenRa.Game/Traits/Selectable.cs
index 6705b16dab..d836a7502c 100755
--- a/OpenRa.Game/Traits/Selectable.cs
+++ b/OpenRa.Game/Traits/Selectable.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public class SelectableInfo : StatelessTraitInfo<Selectable>
 	{
diff --git a/OpenRa.Game/Traits/SquishByTank.cs b/OpenRa.Game/Traits/SquishByTank.cs
index b5709d1169..cd18e21a69 100644
--- a/OpenRa.Game/Traits/SquishByTank.cs
+++ b/OpenRa.Game/Traits/SquishByTank.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class SquishByTankInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/StoresOre.cs b/OpenRa.Game/Traits/StoresOre.cs
index e7baaac430..77356c176b 100644
--- a/OpenRa.Game/Traits/StoresOre.cs
+++ b/OpenRa.Game/Traits/StoresOre.cs
@@ -20,7 +20,7 @@
 
 using System.Collections.Generic;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class StoresOreInfo : StatelessTraitInfo<StoresOre>
 	{
diff --git a/OpenRa.Game/Traits/Submarine.cs b/OpenRa.Game/Traits/Submarine.cs
index 3a44bbab2b..b4912b51de 100644
--- a/OpenRa.Game/Traits/Submarine.cs
+++ b/OpenRa.Game/Traits/Submarine.cs
@@ -21,7 +21,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class SubmarineInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/SupportPowers/ChronoshiftPower.cs b/OpenRa.Game/Traits/SupportPowers/ChronoshiftPower.cs
index e743c49c13..23d74bf673 100644
--- a/OpenRa.Game/Traits/SupportPowers/ChronoshiftPower.cs
+++ b/OpenRa.Game/Traits/SupportPowers/ChronoshiftPower.cs
@@ -22,7 +22,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class ChronoshiftPowerInfo : SupportPowerInfo
 	{
diff --git a/OpenRa.Game/Traits/SupportPowers/NukePower.cs b/OpenRa.Game/Traits/SupportPowers/NukePower.cs
index 9a4b60c57c..5aa75ec439 100644
--- a/OpenRa.Game/Traits/SupportPowers/NukePower.cs
+++ b/OpenRa.Game/Traits/SupportPowers/NukePower.cs
@@ -21,7 +21,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class NukePowerInfo : SupportPowerInfo
 	{
diff --git a/OpenRa.Game/Traits/SupportPowers/SupportPower.cs b/OpenRa.Game/Traits/SupportPowers/SupportPower.cs
index a1544f6741..8736744033 100644
--- a/OpenRa.Game/Traits/SupportPowers/SupportPower.cs
+++ b/OpenRa.Game/Traits/SupportPowers/SupportPower.cs
@@ -20,7 +20,7 @@
 
 using System.Linq;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public abstract class SupportPowerInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/TraitsInterfaces.cs b/OpenRa.Game/Traits/TraitsInterfaces.cs
index 7165a2ae87..e1007137a3 100644
--- a/OpenRa.Game/Traits/TraitsInterfaces.cs
+++ b/OpenRa.Game/Traits/TraitsInterfaces.cs
@@ -20,12 +20,12 @@
 
 using System.Collections.Generic;
 using System.Drawing;
-using OpenRa.FileFormats;
-using OpenRa.GameRules;
-using OpenRa.Graphics;
-using OpenRa.Traits.Activities;
+using OpenRA.FileFormats;
+using OpenRA.GameRules;
+using OpenRA.Graphics;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public enum DamageState { Normal, ThreeQuarter, Half, Quarter, Dead };
 	
diff --git a/OpenRa.Game/Traits/TransformsOnDeploy.cs b/OpenRa.Game/Traits/TransformsOnDeploy.cs
index 738241cb5e..5c1e62edaa 100644
--- a/OpenRa.Game/Traits/TransformsOnDeploy.cs
+++ b/OpenRa.Game/Traits/TransformsOnDeploy.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.Traits.Activities;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class TransformsOnDeployInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Turreted.cs b/OpenRa.Game/Traits/Turreted.cs
index e5ebff6b27..3b0a6699ef 100644
--- a/OpenRa.Game/Traits/Turreted.cs
+++ b/OpenRa.Game/Traits/Turreted.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class TurretedInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Unit.cs b/OpenRa.Game/Traits/Unit.cs
index dce71441f0..16e0558d4a 100755
--- a/OpenRa.Game/Traits/Unit.cs
+++ b/OpenRa.Game/Traits/Unit.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class UnitInfo : OwnedActorInfo, ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/Util.cs b/OpenRa.Game/Traits/Util.cs
index 3cc6ccf30b..6fb76ec1b4 100755
--- a/OpenRa.Game/Traits/Util.cs
+++ b/OpenRa.Game/Traits/Util.cs
@@ -20,10 +20,10 @@
 
 using System;
 using System.Linq;
-using OpenRa.Graphics;
-using OpenRa.Traits.Activities;
+using OpenRA.Graphics;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public static class Util
 	{
diff --git a/OpenRa.Game/Traits/Wall.cs b/OpenRa.Game/Traits/Wall.cs
index ec94fb0700..e1f1f8a443 100644
--- a/OpenRa.Game/Traits/Wall.cs
+++ b/OpenRa.Game/Traits/Wall.cs
@@ -21,11 +21,11 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Effects;
-using OpenRa.GameRules;
-using OpenRa.Traits.Activities;
+using OpenRA.Effects;
+using OpenRA.GameRules;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public class WallInfo : StatelessTraitInfo<Wall> {}
 	public class Wall {}
diff --git a/OpenRa.Game/Traits/World/BridgeLoadHook.cs b/OpenRa.Game/Traits/World/BridgeLoadHook.cs
index ac4a6df985..1c7687c603 100644
--- a/OpenRa.Game/Traits/World/BridgeLoadHook.cs
+++ b/OpenRa.Game/Traits/World/BridgeLoadHook.cs
@@ -21,7 +21,7 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class BridgeLoadHookInfo : StatelessTraitInfo<BridgeLoadHook> { }
 
diff --git a/OpenRa.Game/Traits/World/BuildingInfluence.cs b/OpenRa.Game/Traits/World/BuildingInfluence.cs
index 361a7fab3f..342d35419d 100644
--- a/OpenRa.Game/Traits/World/BuildingInfluence.cs
+++ b/OpenRa.Game/Traits/World/BuildingInfluence.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.GameRules;
+using OpenRA.GameRules;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public class BuildingInfluenceInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/World/ChoosePaletteOnSelect.cs b/OpenRa.Game/Traits/World/ChoosePaletteOnSelect.cs
index ffcea6d5d0..152e8b9e95 100644
--- a/OpenRa.Game/Traits/World/ChoosePaletteOnSelect.cs
+++ b/OpenRa.Game/Traits/World/ChoosePaletteOnSelect.cs
@@ -20,7 +20,7 @@
 
 using System.Linq;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class ChoosePaletteOnSelectInfo : StatelessTraitInfo<ChoosePaletteOnSelect> { }
 
diff --git a/OpenRa.Game/Traits/World/ChronoshiftPaletteEffect.cs b/OpenRa.Game/Traits/World/ChronoshiftPaletteEffect.cs
index c5021ddddb..5b11313128 100644
--- a/OpenRa.Game/Traits/World/ChronoshiftPaletteEffect.cs
+++ b/OpenRa.Game/Traits/World/ChronoshiftPaletteEffect.cs
@@ -20,7 +20,7 @@
 
 using System.Drawing;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class ChronoshiftPaletteEffectInfo : StatelessTraitInfo<ChronoshiftPaletteEffect> { }
 
diff --git a/OpenRa.Game/Traits/World/Country.cs b/OpenRa.Game/Traits/World/Country.cs
index 94f716ca2c..f7d6fa850e 100644
--- a/OpenRa.Game/Traits/World/Country.cs
+++ b/OpenRa.Game/Traits/World/Country.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public class CountryInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/World/CrateSpawner.cs b/OpenRa.Game/Traits/World/CrateSpawner.cs
index 92f41c5ec1..f62376401d 100644
--- a/OpenRa.Game/Traits/World/CrateSpawner.cs
+++ b/OpenRa.Game/Traits/World/CrateSpawner.cs
@@ -21,7 +21,7 @@
 using System;
 using System.Collections.Generic;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class CrateSpawnerInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/World/LightPaletteRotator.cs b/OpenRa.Game/Traits/World/LightPaletteRotator.cs
index 1c8e6c9e66..eafcf92cd7 100644
--- a/OpenRa.Game/Traits/World/LightPaletteRotator.cs
+++ b/OpenRa.Game/Traits/World/LightPaletteRotator.cs
@@ -20,7 +20,7 @@
 
 using System.Drawing;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class LightPaletteRotatorInfo : StatelessTraitInfo<LightPaletteRotator> { }
 	class LightPaletteRotator : ITick, IPaletteModifier
diff --git a/OpenRa.Game/Traits/World/OreGrowth.cs b/OpenRa.Game/Traits/World/OreGrowth.cs
index e555ee9275..3e96ca88e2 100644
--- a/OpenRa.Game/Traits/World/OreGrowth.cs
+++ b/OpenRa.Game/Traits/World/OreGrowth.cs
@@ -18,7 +18,7 @@
  */
 #endregion
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class OreGrowthInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/World/PaletteFromFile.cs b/OpenRa.Game/Traits/World/PaletteFromFile.cs
index db23a67f93..f4d1da0f3f 100644
--- a/OpenRa.Game/Traits/World/PaletteFromFile.cs
+++ b/OpenRa.Game/Traits/World/PaletteFromFile.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class PaletteFromFileInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/World/PaletteFromRGBA.cs b/OpenRa.Game/Traits/World/PaletteFromRGBA.cs
index 3931559b6a..72366fc1eb 100644
--- a/OpenRa.Game/Traits/World/PaletteFromRGBA.cs
+++ b/OpenRa.Game/Traits/World/PaletteFromRGBA.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System.Drawing;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class PaletteFromRGBAInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/World/PaletteFromRemap.cs b/OpenRa.Game/Traits/World/PaletteFromRemap.cs
index e3909367ca..371c538abb 100644
--- a/OpenRa.Game/Traits/World/PaletteFromRemap.cs
+++ b/OpenRa.Game/Traits/World/PaletteFromRemap.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class PaletteFromRemapInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/World/PlayerColorPalette.cs b/OpenRa.Game/Traits/World/PlayerColorPalette.cs
index b6ab51eaa1..ba62c62103 100644
--- a/OpenRa.Game/Traits/World/PlayerColorPalette.cs
+++ b/OpenRa.Game/Traits/World/PlayerColorPalette.cs
@@ -19,9 +19,9 @@
 #endregion
 
 using System.Drawing;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class PlayerColorPaletteInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/World/ScreenShaker.cs b/OpenRa.Game/Traits/World/ScreenShaker.cs
index f5a5087a1c..5cdaf2ca67 100644
--- a/OpenRa.Game/Traits/World/ScreenShaker.cs
+++ b/OpenRa.Game/Traits/World/ScreenShaker.cs
@@ -1,11 +1,11 @@
 
 using System;
 using System.Linq;
-using OpenRa.Traits;
+using OpenRA.Traits;
 using System.Collections.Generic;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class ScreenShakerInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/World/ShroudPalette.cs b/OpenRa.Game/Traits/World/ShroudPalette.cs
index d2159da2a8..4c67e07025 100644
--- a/OpenRa.Game/Traits/World/ShroudPalette.cs
+++ b/OpenRa.Game/Traits/World/ShroudPalette.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class ShroudPaletteInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/World/UnitInfluence.cs b/OpenRa.Game/Traits/World/UnitInfluence.cs
index 0eaea7fee5..1f9fb559d5 100644
--- a/OpenRa.Game/Traits/World/UnitInfluence.cs
+++ b/OpenRa.Game/Traits/World/UnitInfluence.cs
@@ -23,7 +23,7 @@ using System.Collections.Generic;
 using System.Diagnostics;
 using System.Linq;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	public class UnitInfluenceInfo : ITraitInfo
 	{
diff --git a/OpenRa.Game/Traits/World/WaterPaletteRotation.cs b/OpenRa.Game/Traits/World/WaterPaletteRotation.cs
index 82e6cd61f2..d15c015aec 100644
--- a/OpenRa.Game/Traits/World/WaterPaletteRotation.cs
+++ b/OpenRa.Game/Traits/World/WaterPaletteRotation.cs
@@ -20,7 +20,7 @@
 
 using System.Drawing;
 
-namespace OpenRa.Traits
+namespace OpenRA.Traits
 {
 	class WaterPaletteRotationInfo : StatelessTraitInfo<WaterPaletteRotation> { }
 
diff --git a/OpenRa.Game/UiOverlay.cs b/OpenRa.Game/UiOverlay.cs
index a236aa06ad..5308a449f4 100644
--- a/OpenRa.Game/UiOverlay.cs
+++ b/OpenRa.Game/UiOverlay.cs
@@ -20,11 +20,11 @@
 
 using System.Drawing;
 using System.Linq;
-using OpenRa.GameRules;
-using OpenRa.Graphics;
-using OpenRa.Traits;
+using OpenRA.GameRules;
+using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRa
+namespace OpenRA
 {
 	class UiOverlay
 	{
diff --git a/OpenRa.Game/World.cs b/OpenRa.Game/World.cs
index 9ffb360ba2..0cb656328b 100644
--- a/OpenRa.Game/World.cs
+++ b/OpenRa.Game/World.cs
@@ -21,14 +21,14 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Collections;
-using OpenRa.Effects;
-using OpenRa.FileFormats;
-using OpenRa.Graphics;
-using OpenRa.Support;
-using OpenRa.Traits;
+using OpenRA.Collections;
+using OpenRA.Effects;
+using OpenRA.FileFormats;
+using OpenRA.Graphics;
+using OpenRA.Support;
+using OpenRA.Traits;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public class World
 	{
diff --git a/OpenRa.Game/WorldUtils.cs b/OpenRa.Game/WorldUtils.cs
index 03dca0a120..c53801adbd 100755
--- a/OpenRa.Game/WorldUtils.cs
+++ b/OpenRa.Game/WorldUtils.cs
@@ -22,11 +22,11 @@ using System;
 using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
-using OpenRa.FileFormats;
-using OpenRa.GameRules;
-using OpenRa.Traits;
+using OpenRA.FileFormats;
+using OpenRA.GameRules;
+using OpenRA.Traits;
 
-namespace OpenRa
+namespace OpenRA
 {
 	public static class WorldUtils
 	{
diff --git a/OpenRa.Gl/GraphicsDevice.cs b/OpenRa.Gl/GraphicsDevice.cs
index 331fa2086d..6333c74a48 100644
--- a/OpenRa.Gl/GraphicsDevice.cs
+++ b/OpenRa.Gl/GraphicsDevice.cs
@@ -26,12 +26,12 @@ using System.Runtime.InteropServices;
 using System.Windows.Forms;
 using Tao.Cg;
 using Tao.OpenGl;
-using OpenRa.FileFormats.Graphics;
+using OpenRA.FileFormats.Graphics;
 using Tao.Sdl;
 
-[assembly: Renderer( typeof( OpenRa.GlRenderer.GraphicsDevice ))]
+[assembly: Renderer( typeof( OpenRA.GlRenderer.GraphicsDevice ))]
 
-namespace OpenRa.GlRenderer
+namespace OpenRA.GlRenderer
 {
     public class GraphicsDevice : IGraphicsDevice
     {
@@ -163,7 +163,7 @@ namespace OpenRa.GlRenderer
 				switch (e.type)
 				{
 					case Sdl.SDL_QUIT:
-						OpenRa.Game.Exit();
+						OpenRA.Game.Exit();
 						break;
 
 					case Sdl.SDL_MOUSEBUTTONDOWN:
@@ -204,7 +204,7 @@ namespace OpenRa.GlRenderer
 								if( keyName.Length == 1 )
 									Game.HandleKeyPress( new KeyPressEventArgs( keyName[ 0 ] ), mods );
 								else if( keyName == "f4" && ( ( mods & Modifiers.Alt ) != 0 ) )
-									OpenRa.Game.Exit();
+									OpenRA.Game.Exit();
 							}
 						} break;
 
diff --git a/OpenRa.Gl/OpenRa.Gl.csproj b/OpenRa.Gl/OpenRa.Gl.csproj
index 28e892ea54..582e0fd2cf 100644
--- a/OpenRa.Gl/OpenRa.Gl.csproj
+++ b/OpenRa.Gl/OpenRa.Gl.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRa.GlRenderer</RootNamespace>
-    <AssemblyName>OpenRa.Gl</AssemblyName>
+    <RootNamespace>OpenRA.GlRenderer</RootNamespace>
+    <AssemblyName>OpenRA.Gl</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -52,13 +52,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OpenRa.FileFormats\OpenRa.FileFormats.csproj">
+    <ProjectReference Include="..\OpenRa.FileFormats\OpenRA.FileFormats.csproj">
       <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
-      <Name>OpenRa.FileFormats</Name>
+      <Name>OpenRA.FileFormats</Name>
     </ProjectReference>
-    <ProjectReference Include="..\OpenRa.Game\OpenRa.Game.csproj">
+    <ProjectReference Include="..\OpenRa.Game\OpenRA.Game.csproj">
       <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
-      <Name>OpenRa.Game</Name>
+      <Name>OpenRA.Game</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/OpenRa.Mods.Aftermath/ChronoshiftDeploy.cs b/OpenRa.Mods.Aftermath/ChronoshiftDeploy.cs
index 28dd30f20b..19f877afe9 100644
--- a/OpenRa.Mods.Aftermath/ChronoshiftDeploy.cs
+++ b/OpenRa.Mods.Aftermath/ChronoshiftDeploy.cs
@@ -19,11 +19,11 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Mods.Aftermath.Orders;
-using OpenRa.Traits;
-using OpenRa.Traits.Activities;
+using OpenRA.Mods.Aftermath.Orders;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Mods.Aftermath
+namespace OpenRA.Mods.Aftermath
 {
 	class ChronoshiftDeployInfo : ITraitInfo
 	{
diff --git a/OpenRa.Mods.Aftermath/DemoTruck.cs b/OpenRa.Mods.Aftermath/DemoTruck.cs
index 33344ba61e..d4876dbad5 100644
--- a/OpenRa.Mods.Aftermath/DemoTruck.cs
+++ b/OpenRa.Mods.Aftermath/DemoTruck.cs
@@ -18,10 +18,10 @@
  */
 #endregion
 
-using OpenRa.Effects;
-using OpenRa.Traits;
+using OpenRA.Effects;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.Aftermath
+namespace OpenRA.Mods.Aftermath
 {
 	class DemoTruckInfo : ITraitInfo
 	{
diff --git a/OpenRa.Mods.Aftermath/OpenRa.Mods.Aftermath.csproj b/OpenRa.Mods.Aftermath/OpenRa.Mods.Aftermath.csproj
index 8bd416ae04..4e651ff089 100644
--- a/OpenRa.Mods.Aftermath/OpenRa.Mods.Aftermath.csproj
+++ b/OpenRa.Mods.Aftermath/OpenRa.Mods.Aftermath.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{2E1F8D8B-AEF5-4BCE-A95C-50223A0C7331}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRa.Mods.Aftermath</RootNamespace>
-    <AssemblyName>OpenRa.Mods.Aftermath</AssemblyName>
+    <RootNamespace>OpenRA.Mods.Aftermath</RootNamespace>
+    <AssemblyName>OpenRA.Mods.Aftermath</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -52,13 +52,13 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OpenRa.FileFormats\OpenRa.FileFormats.csproj">
+    <ProjectReference Include="..\OpenRa.FileFormats\OpenRA.FileFormats.csproj">
       <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
-      <Name>OpenRa.FileFormats</Name>
+      <Name>OpenRA.FileFormats</Name>
     </ProjectReference>
-    <ProjectReference Include="..\OpenRa.Game\OpenRa.Game.csproj">
+    <ProjectReference Include="..\OpenRa.Game\OpenRA.Game.csproj">
       <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
-      <Name>OpenRa.Game</Name>
+      <Name>OpenRA.Game</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/OpenRa.Mods.Aftermath/Orders/SetChronoTankDestination.cs b/OpenRa.Mods.Aftermath/Orders/SetChronoTankDestination.cs
index a8b6072712..c9e2758b9f 100644
--- a/OpenRa.Mods.Aftermath/Orders/SetChronoTankDestination.cs
+++ b/OpenRa.Mods.Aftermath/Orders/SetChronoTankDestination.cs
@@ -20,9 +20,9 @@
 
 using System.Collections.Generic;
 using System.Drawing;
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.Aftermath.Orders
+namespace OpenRA.Mods.Aftermath.Orders
 {
 	class SetChronoTankDestination : IOrderGenerator
 	{
diff --git a/OpenRa.Mods.Cnc/OpenRa.Mods.Cnc.csproj b/OpenRa.Mods.Cnc/OpenRa.Mods.Cnc.csproj
index 599897c06d..cfdc4809d8 100644
--- a/OpenRa.Mods.Cnc/OpenRa.Mods.Cnc.csproj
+++ b/OpenRa.Mods.Cnc/OpenRa.Mods.Cnc.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{2881135D-4D62-493E-8F83-5EEE92CCC6BE}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRa.Mods.Cnc</RootNamespace>
-    <AssemblyName>OpenRa.Mods.Cnc</AssemblyName>
+    <RootNamespace>OpenRA.Mods.Cnc</RootNamespace>
+    <AssemblyName>OpenRA.Mods.Cnc</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -50,17 +50,17 @@
     <Compile Include="TiberiumRefinery.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OpenRa.FileFormats\OpenRa.FileFormats.csproj">
+    <ProjectReference Include="..\OpenRa.FileFormats\OpenRA.FileFormats.csproj">
       <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
-      <Name>OpenRa.FileFormats</Name>
+      <Name>OpenRA.FileFormats</Name>
     </ProjectReference>
-    <ProjectReference Include="..\OpenRa.Game\OpenRa.Game.csproj">
+    <ProjectReference Include="..\OpenRa.Game\OpenRA.Game.csproj">
       <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
-      <Name>OpenRa.Game</Name>
+      <Name>OpenRA.Game</Name>
     </ProjectReference>
-    <ProjectReference Include="..\OpenRa.Mods.RA\OpenRa.Mods.RA.csproj">
+    <ProjectReference Include="..\OpenRa.Mods.RA\OpenRA.Mods.RA.csproj">
       <Project>{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}</Project>
-      <Name>OpenRa.Mods.RA</Name>
+      <Name>OpenRA.Mods.RA</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/OpenRa.Mods.Cnc/ProductionAirdrop.cs b/OpenRa.Mods.Cnc/ProductionAirdrop.cs
index 812ffe23a0..0c97976100 100644
--- a/OpenRa.Mods.Cnc/ProductionAirdrop.cs
+++ b/OpenRa.Mods.Cnc/ProductionAirdrop.cs
@@ -18,11 +18,11 @@
  */
 #endregion
 
-using OpenRa.GameRules;
-using OpenRa.Traits;
-using OpenRa.Traits.Activities;
+using OpenRA.GameRules;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Mods.Cnc
+namespace OpenRA.Mods.Cnc
 {
 	public class ProductionAirdropInfo : ProductionInfo
 	{
diff --git a/OpenRa.Mods.Cnc/TiberiumRefinery.cs b/OpenRa.Mods.Cnc/TiberiumRefinery.cs
index fb9444b151..500067f61c 100644
--- a/OpenRa.Mods.Cnc/TiberiumRefinery.cs
+++ b/OpenRa.Mods.Cnc/TiberiumRefinery.cs
@@ -18,10 +18,10 @@
  */
 #endregion
 
-using OpenRa.Traits;
-using OpenRa.Traits.Activities;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Mods.Cnc
+namespace OpenRA.Mods.Cnc
 {
 	class TiberiumRefineryInfo : ITraitInfo
 	{
diff --git a/OpenRa.Mods.RA/Activities/CaptureBuilding.cs b/OpenRa.Mods.RA/Activities/CaptureBuilding.cs
index 5d95c860c1..3767610680 100644
--- a/OpenRa.Mods.RA/Activities/CaptureBuilding.cs
+++ b/OpenRa.Mods.RA/Activities/CaptureBuilding.cs
@@ -18,10 +18,10 @@
  */
 #endregion
 
-using OpenRa.Traits;
-using OpenRa.Traits.Activities;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Mods.RA.Activities
+namespace OpenRA.Mods.RA.Activities
 {
 	class CaptureBuilding : IActivity
 	{
diff --git a/OpenRa.Mods.RA/Activities/Demolish.cs b/OpenRa.Mods.RA/Activities/Demolish.cs
index 4a9085a9e0..6aa0dd4678 100644
--- a/OpenRa.Mods.RA/Activities/Demolish.cs
+++ b/OpenRa.Mods.RA/Activities/Demolish.cs
@@ -18,10 +18,10 @@
  */
 #endregion
 
-using OpenRa.Effects;
-using OpenRa.Traits;
+using OpenRA.Effects;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA.Activities
+namespace OpenRA.Mods.RA.Activities
 {
 	class Demolish : IActivity
 	{
diff --git a/OpenRa.Mods.RA/Activities/Infiltrate.cs b/OpenRa.Mods.RA/Activities/Infiltrate.cs
index d7628097b3..a48b015aa8 100644
--- a/OpenRa.Mods.RA/Activities/Infiltrate.cs
+++ b/OpenRa.Mods.RA/Activities/Infiltrate.cs
@@ -18,10 +18,10 @@
  */
 #endregion
 
-using OpenRa.Traits;
-using OpenRa.Traits.Activities;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Mods.RA.Activities
+namespace OpenRA.Mods.RA.Activities
 {
 	class Infiltrate : IActivity
 	{
diff --git a/OpenRa.Mods.RA/Activities/LayMine.cs b/OpenRa.Mods.RA/Activities/LayMine.cs
index c4d6ba7a02..feebe6ebd1 100755
--- a/OpenRa.Mods.RA/Activities/LayMine.cs
+++ b/OpenRa.Mods.RA/Activities/LayMine.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA.Activities
+namespace OpenRA.Mods.RA.Activities
 {
 	class LayMine : IActivity
 	{
diff --git a/OpenRa.Mods.RA/Activities/Steal.cs b/OpenRa.Mods.RA/Activities/Steal.cs
index c2928c0163..c4df427e80 100644
--- a/OpenRa.Mods.RA/Activities/Steal.cs
+++ b/OpenRa.Mods.RA/Activities/Steal.cs
@@ -18,10 +18,10 @@
  */
 #endregion
 
-using OpenRa.Traits;
-using OpenRa.Traits.Activities;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Mods.RA.Activities
+namespace OpenRA.Mods.RA.Activities
 {
 	class Steal : IActivity
 	{
diff --git a/OpenRa.Mods.RA/C4Demolition.cs b/OpenRa.Mods.RA/C4Demolition.cs
index 3000d1562f..8d5a69b181 100644
--- a/OpenRa.Mods.RA/C4Demolition.cs
+++ b/OpenRa.Mods.RA/C4Demolition.cs
@@ -18,11 +18,11 @@
  */
 #endregion
 
-using OpenRa.Mods.RA.Activities;
-using OpenRa.Traits;
-using OpenRa.Traits.Activities;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class C4DemolitionInfo : StatelessTraitInfo<C4Demolition> { }
 
diff --git a/OpenRa.Mods.RA/Crates/ArmorUpgradeCrateAction.cs b/OpenRa.Mods.RA/Crates/ArmorUpgradeCrateAction.cs
index 4115337e07..65fe882c58 100644
--- a/OpenRa.Mods.RA/Crates/ArmorUpgradeCrateAction.cs
+++ b/OpenRa.Mods.RA/Crates/ArmorUpgradeCrateAction.cs
@@ -18,10 +18,10 @@
  */
 #endregion
 
-using OpenRa.Mods.RA.Effects;
-using OpenRa.Traits;
+using OpenRA.Mods.RA.Effects;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class ArmorUpgradeCrateActionInfo : ITraitInfo
 	{
diff --git a/OpenRa.Mods.RA/Crates/FirepowerUpgradeCrateAction.cs b/OpenRa.Mods.RA/Crates/FirepowerUpgradeCrateAction.cs
index 7643a7a62c..e21d586520 100644
--- a/OpenRa.Mods.RA/Crates/FirepowerUpgradeCrateAction.cs
+++ b/OpenRa.Mods.RA/Crates/FirepowerUpgradeCrateAction.cs
@@ -18,10 +18,10 @@
  */
 #endregion
 
-using OpenRa.Mods.RA.Effects;
-using OpenRa.Traits;
+using OpenRA.Mods.RA.Effects;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class FirepowerUpgradeCrateActionInfo : ITraitInfo
 	{
diff --git a/OpenRa.Mods.RA/Crates/GiveCashCrateAction.cs b/OpenRa.Mods.RA/Crates/GiveCashCrateAction.cs
index 857deb11ab..cac401d52b 100644
--- a/OpenRa.Mods.RA/Crates/GiveCashCrateAction.cs
+++ b/OpenRa.Mods.RA/Crates/GiveCashCrateAction.cs
@@ -18,10 +18,10 @@
  */
 #endregion
 
-using OpenRa.Mods.RA.Effects;
-using OpenRa.Traits;
+using OpenRA.Mods.RA.Effects;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class GiveCashCrateActionInfo : ITraitInfo
 	{
diff --git a/OpenRa.Mods.RA/Crates/SpeedUpgradeCrateAction.cs b/OpenRa.Mods.RA/Crates/SpeedUpgradeCrateAction.cs
index 4dc3390e41..09ff17e19d 100644
--- a/OpenRa.Mods.RA/Crates/SpeedUpgradeCrateAction.cs
+++ b/OpenRa.Mods.RA/Crates/SpeedUpgradeCrateAction.cs
@@ -18,10 +18,10 @@
  */
 #endregion
 
-using OpenRa.Mods.RA.Effects;
-using OpenRa.Traits;
+using OpenRA.Mods.RA.Effects;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class SpeedUpgradeCrateActionInfo : ITraitInfo
 	{
diff --git a/OpenRa.Mods.RA/Effects/CrateEffect.cs b/OpenRa.Mods.RA/Effects/CrateEffect.cs
index dc87eb4b7a..7a6049a6a7 100644
--- a/OpenRa.Mods.RA/Effects/CrateEffect.cs
+++ b/OpenRa.Mods.RA/Effects/CrateEffect.cs
@@ -19,11 +19,11 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Effects;
-using OpenRa.Graphics;
-using OpenRa.Traits;
+using OpenRA.Effects;
+using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA.Effects
+namespace OpenRA.Mods.RA.Effects
 {
 	class CrateEffect : IEffect
 	{
diff --git a/OpenRa.Mods.RA/Effects/GpsSatellite.cs b/OpenRa.Mods.RA/Effects/GpsSatellite.cs
index d647f9098e..fa9ce588ff 100644
--- a/OpenRa.Mods.RA/Effects/GpsSatellite.cs
+++ b/OpenRa.Mods.RA/Effects/GpsSatellite.cs
@@ -19,11 +19,11 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Effects;
-using OpenRa.Graphics;
-using OpenRa.Traits;
+using OpenRA.Effects;
+using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA.Effects
+namespace OpenRA.Mods.RA.Effects
 {
 	class GpsSatellite : IEffect
 	{
diff --git a/OpenRa.Mods.RA/Effects/InvulnEffect.cs b/OpenRa.Mods.RA/Effects/InvulnEffect.cs
index 59231c4a8c..a255bca624 100644
--- a/OpenRa.Mods.RA/Effects/InvulnEffect.cs
+++ b/OpenRa.Mods.RA/Effects/InvulnEffect.cs
@@ -19,10 +19,10 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Effects;
-using OpenRa.Traits;
+using OpenRA.Effects;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA.Effects
+namespace OpenRA.Mods.RA.Effects
 {
 	class InvulnEffect : IEffect
 	{
diff --git a/OpenRa.Mods.RA/Effects/Parachute.cs b/OpenRa.Mods.RA/Effects/Parachute.cs
index 7e49f9a192..162f1a7a2c 100644
--- a/OpenRa.Mods.RA/Effects/Parachute.cs
+++ b/OpenRa.Mods.RA/Effects/Parachute.cs
@@ -19,11 +19,11 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Effects;
-using OpenRa.Graphics;
-using OpenRa.Traits;
+using OpenRA.Effects;
+using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA.Effects
+namespace OpenRA.Mods.RA.Effects
 {
 	class Parachute : IEffect
 	{
diff --git a/OpenRa.Mods.RA/Effects/SatelliteLaunch.cs b/OpenRa.Mods.RA/Effects/SatelliteLaunch.cs
index 7bd708f7e0..4a3eaeda2d 100644
--- a/OpenRa.Mods.RA/Effects/SatelliteLaunch.cs
+++ b/OpenRa.Mods.RA/Effects/SatelliteLaunch.cs
@@ -19,11 +19,11 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Effects;
-using OpenRa.Graphics;
-using OpenRa.Traits;
+using OpenRA.Effects;
+using OpenRA.Graphics;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA.Effects
+namespace OpenRA.Mods.RA.Effects
 {
 	class SatelliteLaunch : IEffect
 	{
diff --git a/OpenRa.Mods.RA/EngineerCapture.cs b/OpenRa.Mods.RA/EngineerCapture.cs
index faff7fe382..656e4486bb 100644
--- a/OpenRa.Mods.RA/EngineerCapture.cs
+++ b/OpenRa.Mods.RA/EngineerCapture.cs
@@ -18,11 +18,11 @@
  */
 #endregion
 
-using OpenRa.Mods.RA.Activities;
-using OpenRa.Traits;
-using OpenRa.Traits.Activities;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class EngineerCaptureInfo : StatelessTraitInfo<EngineerCapture> { }
 
diff --git a/OpenRa.Mods.RA/GpsPower.cs b/OpenRa.Mods.RA/GpsPower.cs
index 9509cd8f66..153d4a03d8 100644
--- a/OpenRa.Mods.RA/GpsPower.cs
+++ b/OpenRa.Mods.RA/GpsPower.cs
@@ -19,11 +19,11 @@
 #endregion
 
 using System.Linq;
-using OpenRa.Effects;
-using OpenRa.Mods.RA.Effects;
-using OpenRa.Traits;
+using OpenRA.Effects;
+using OpenRA.Mods.RA.Effects;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class GpsPowerInfo : SupportPowerInfo
 	{
diff --git a/OpenRa.Mods.RA/InfiltrateForSonarPulse.cs b/OpenRa.Mods.RA/InfiltrateForSonarPulse.cs
index b8f5bc2b75..a9dd26c2db 100644
--- a/OpenRa.Mods.RA/InfiltrateForSonarPulse.cs
+++ b/OpenRa.Mods.RA/InfiltrateForSonarPulse.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class InfiltrateForSonarPulseInfo : StatelessTraitInfo<InfiltrateForSonarPulse> { }
 	
diff --git a/OpenRa.Mods.RA/IronCurtainPower.cs b/OpenRa.Mods.RA/IronCurtainPower.cs
index a86d4a0f57..fd739c6204 100644
--- a/OpenRa.Mods.RA/IronCurtainPower.cs
+++ b/OpenRa.Mods.RA/IronCurtainPower.cs
@@ -20,9 +20,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class IronCurtainPowerInfo : SupportPowerInfo
 	{
diff --git a/OpenRa.Mods.RA/IronCurtainable.cs b/OpenRa.Mods.RA/IronCurtainable.cs
index 26382a9c04..7ab0ade00d 100644
--- a/OpenRa.Mods.RA/IronCurtainable.cs
+++ b/OpenRa.Mods.RA/IronCurtainable.cs
@@ -18,10 +18,10 @@
  */
 #endregion
 
-using OpenRa.Mods.RA.Effects;
-using OpenRa.Traits;
+using OpenRA.Mods.RA.Effects;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class IronCurtainableInfo : ITraitInfo
 	{
diff --git a/OpenRa.Mods.RA/Mine.cs b/OpenRa.Mods.RA/Mine.cs
index f2128a73d3..0daad0d68b 100644
--- a/OpenRa.Mods.RA/Mine.cs
+++ b/OpenRa.Mods.RA/Mine.cs
@@ -20,10 +20,10 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Effects;
-using OpenRa.Traits;
+using OpenRA.Effects;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class MineInfo : ITraitInfo
 	{
diff --git a/OpenRa.Mods.RA/Minelayer.cs b/OpenRa.Mods.RA/Minelayer.cs
index 2ab9245e9d..1dc1ec0f1c 100644
--- a/OpenRa.Mods.RA/Minelayer.cs
+++ b/OpenRa.Mods.RA/Minelayer.cs
@@ -19,10 +19,10 @@
 #endregion
 
 using System.Linq;
-using OpenRa.Mods.RA.Activities;
-using OpenRa.Traits;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class MinelayerInfo : StatelessTraitInfo<Minelayer>
 	{
diff --git a/OpenRa.Mods.RA/OpenRa.Mods.RA.csproj b/OpenRa.Mods.RA/OpenRa.Mods.RA.csproj
index dba204c5af..23b731c65f 100644
--- a/OpenRa.Mods.RA/OpenRa.Mods.RA.csproj
+++ b/OpenRa.Mods.RA/OpenRa.Mods.RA.csproj
@@ -8,8 +8,8 @@
     <ProjectGuid>{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>OpenRa.Mods.RA</RootNamespace>
-    <AssemblyName>OpenRa.Mods.RA</AssemblyName>
+    <RootNamespace>OpenRA.Mods.RA</RootNamespace>
+    <AssemblyName>OpenRA.Mods.RA</AssemblyName>
     <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -80,13 +80,13 @@
     <Compile Include="Thief.cs" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OpenRa.FileFormats\OpenRa.FileFormats.csproj">
+    <ProjectReference Include="..\OpenRa.FileFormats\OpenRA.FileFormats.csproj">
       <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
-      <Name>OpenRa.FileFormats</Name>
+      <Name>OpenRA.FileFormats</Name>
     </ProjectReference>
-    <ProjectReference Include="..\OpenRa.Game\OpenRa.Game.csproj">
+    <ProjectReference Include="..\OpenRa.Game\OpenRA.Game.csproj">
       <Project>{0DFB103F-2962-400F-8C6D-E2C28CCBA633}</Project>
-      <Name>OpenRa.Game</Name>
+      <Name>OpenRA.Game</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/OpenRa.Mods.RA/ParaDrop.cs b/OpenRa.Mods.RA/ParaDrop.cs
index 80f83eeeaa..d3527dc00d 100644
--- a/OpenRa.Mods.RA/ParaDrop.cs
+++ b/OpenRa.Mods.RA/ParaDrop.cs
@@ -19,11 +19,11 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Mods.RA.Effects;
-using OpenRa.Traits;
-using OpenRa.Traits.Activities;
+using OpenRA.Mods.RA.Effects;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class ParaDropInfo : ITraitInfo
 	{
diff --git a/OpenRa.Mods.RA/ParatroopersPower.cs b/OpenRa.Mods.RA/ParatroopersPower.cs
index 56e8e41560..f20c4f4425 100644
--- a/OpenRa.Mods.RA/ParatroopersPower.cs
+++ b/OpenRa.Mods.RA/ParatroopersPower.cs
@@ -19,10 +19,10 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Traits;
-using OpenRa.Traits.Activities;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class ParatroopersPowerInfo : SupportPowerInfo
 	{
diff --git a/OpenRa.Mods.RA/RenderSpy.cs b/OpenRa.Mods.RA/RenderSpy.cs
index 35a8d18e07..10f120d760 100644
--- a/OpenRa.Mods.RA/RenderSpy.cs
+++ b/OpenRa.Mods.RA/RenderSpy.cs
@@ -20,9 +20,9 @@
 
 using System.Collections.Generic;
 using System.Linq;
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class RenderSpyInfo : RenderInfantryInfo
 	{
diff --git a/OpenRa.Mods.RA/RepairableNear.cs b/OpenRa.Mods.RA/RepairableNear.cs
index ccd4762bbd..81384e8cd3 100644
--- a/OpenRa.Mods.RA/RepairableNear.cs
+++ b/OpenRa.Mods.RA/RepairableNear.cs
@@ -18,10 +18,10 @@
  */
 #endregion
 
-using OpenRa.Traits;
-using OpenRa.Traits.Activities;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class RepairableNearInfo : StatelessTraitInfo<RepairableNear> { }
 
diff --git a/OpenRa.Mods.RA/RequiresPower.cs b/OpenRa.Mods.RA/RequiresPower.cs
index b0742aaafc..64679ce94c 100644
--- a/OpenRa.Mods.RA/RequiresPower.cs
+++ b/OpenRa.Mods.RA/RequiresPower.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class RequiresPowerInfo : ITraitInfo
 	{
diff --git a/OpenRa.Mods.RA/SonarPulsePower.cs b/OpenRa.Mods.RA/SonarPulsePower.cs
index 80ef3aa0a3..6f6c4e47dd 100644
--- a/OpenRa.Mods.RA/SonarPulsePower.cs
+++ b/OpenRa.Mods.RA/SonarPulsePower.cs
@@ -18,9 +18,9 @@
  */
 #endregion
 
-using OpenRa.Traits;
+using OpenRA.Traits;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	public class SonarPulsePowerInfo : SupportPowerInfo
 	{
diff --git a/OpenRa.Mods.RA/Spy.cs b/OpenRa.Mods.RA/Spy.cs
index 92c52aabbd..b7992e5aef 100644
--- a/OpenRa.Mods.RA/Spy.cs
+++ b/OpenRa.Mods.RA/Spy.cs
@@ -18,11 +18,11 @@
  */
 #endregion
 
-using OpenRa.Mods.RA.Activities;
-using OpenRa.Traits;
-using OpenRa.Traits.Activities;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class SpyInfo : StatelessTraitInfo<Spy> { }
 
diff --git a/OpenRa.Mods.RA/SpyPlanePower.cs b/OpenRa.Mods.RA/SpyPlanePower.cs
index b851ca6530..44993f2473 100644
--- a/OpenRa.Mods.RA/SpyPlanePower.cs
+++ b/OpenRa.Mods.RA/SpyPlanePower.cs
@@ -19,10 +19,10 @@
 #endregion
 
 using System.Collections.Generic;
-using OpenRa.Traits;
-using OpenRa.Traits.Activities;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class SpyPlanePowerInfo : SupportPowerInfo
 	{
diff --git a/OpenRa.Mods.RA/Thief.cs b/OpenRa.Mods.RA/Thief.cs
index ca54e3ce01..6e74749694 100644
--- a/OpenRa.Mods.RA/Thief.cs
+++ b/OpenRa.Mods.RA/Thief.cs
@@ -18,11 +18,11 @@
  */
 #endregion
 
-using OpenRa.Mods.RA.Activities;
-using OpenRa.Traits;
-using OpenRa.Traits.Activities;
+using OpenRA.Mods.RA.Activities;
+using OpenRA.Traits;
+using OpenRA.Traits.Activities;
 
-namespace OpenRa.Mods.RA
+namespace OpenRA.Mods.RA
 {
 	class ThiefInfo : StatelessTraitInfo<Thief> { }
 
diff --git a/OpenRa.sln b/OpenRa.sln
index 31dd838bcd..e7026fd5ae 100644
--- a/OpenRa.sln
+++ b/OpenRa.sln
@@ -1,21 +1,21 @@
 
 Microsoft Visual Studio Solution File, Format Version 10.00
 # Visual Studio 2008
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.FileFormats", "OpenRa.FileFormats\OpenRa.FileFormats.csproj", "{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.FileFormats", "OpenRa.FileFormats\OpenRA.FileFormats.csproj", "{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.Game", "OpenRa.Game\OpenRa.Game.csproj", "{0DFB103F-2962-400F-8C6D-E2C28CCBA633}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Game", "OpenRa.Game\OpenRA.Game.csproj", "{0DFB103F-2962-400F-8C6D-E2C28CCBA633}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "SequenceEditor", "SequenceEditor\SequenceEditor.csproj", "{230F65CE-A6DE-4235-8B38-13A3D606C7F7}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Server", "OpenRA.Server\OpenRA.Server.csproj", "{76F621A1-3D8E-4A99-9F7E-B071EB657817}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.Mods.RA", "OpenRa.Mods.RA\OpenRa.Mods.RA.csproj", "{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.RA", "OpenRa.Mods.RA\OpenRA.Mods.RA.csproj", "{4A8A43B5-A9EF-4ED0-99DD-4BAB10A0DB6E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.Mods.Aftermath", "OpenRa.Mods.Aftermath\OpenRa.Mods.Aftermath.csproj", "{2E1F8D8B-AEF5-4BCE-A95C-50223A0C7331}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.Aftermath", "OpenRa.Mods.Aftermath\OpenRA.Mods.Aftermath.csproj", "{2E1F8D8B-AEF5-4BCE-A95C-50223A0C7331}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.Mods.Cnc", "OpenRa.Mods.Cnc\OpenRa.Mods.Cnc.csproj", "{2881135D-4D62-493E-8F83-5EEE92CCC6BE}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Mods.Cnc", "OpenRa.Mods.Cnc\OpenRA.Mods.Cnc.csproj", "{2881135D-4D62-493E-8F83-5EEE92CCC6BE}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRa.Gl", "OpenRa.Gl\OpenRa.Gl.csproj", "{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "OpenRA.Gl", "OpenRa.Gl\OpenRA.Gl.csproj", "{67CF1A10-C5F6-48FA-B1A7-FE83BE4CE2CC}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mkremap", "mkremap\mkremap.csproj", "{3A2C18E7-0379-4D72-8A56-B850CB765197}"
 EndProject
diff --git a/SequenceEditor/Program.cs b/SequenceEditor/Program.cs
index 2819c4e6c4..cdeb939037 100644
--- a/SequenceEditor/Program.cs
+++ b/SequenceEditor/Program.cs
@@ -24,7 +24,7 @@ using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
 using System.Xml;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
 namespace SequenceEditor
 {
diff --git a/SequenceEditor/SequenceEditor.csproj b/SequenceEditor/SequenceEditor.csproj
index 5ccfc747e1..aafb429b0e 100644
--- a/SequenceEditor/SequenceEditor.csproj
+++ b/SequenceEditor/SequenceEditor.csproj
@@ -91,9 +91,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\OpenRa.FileFormats\OpenRa.FileFormats.csproj">
+    <ProjectReference Include="..\OpenRa.FileFormats\OpenRA.FileFormats.csproj">
       <Project>{BDAEAB25-991E-46A7-AF1E-4F0E03358DAA}</Project>
-      <Name>OpenRa.FileFormats</Name>
+      <Name>OpenRA.FileFormats</Name>
     </ProjectReference>
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/SequenceEditor/Surface.cs b/SequenceEditor/Surface.cs
index 4c8cc00d83..bf47782ff6 100644
--- a/SequenceEditor/Surface.cs
+++ b/SequenceEditor/Surface.cs
@@ -23,7 +23,7 @@ using System.Collections.Generic;
 using System.Drawing;
 using System.Linq;
 using System.Windows.Forms;
-using OpenRa.FileFormats;
+using OpenRA.FileFormats;
 
 namespace SequenceEditor
 {