diff --git a/src/AddIns/Analysis/CodeQuality/Src/MainWindow.xaml b/src/AddIns/Analysis/CodeQuality/Src/MainWindow.xaml
index da94a8b384..af5c8b2352 100644
--- a/src/AddIns/Analysis/CodeQuality/Src/MainWindow.xaml
+++ b/src/AddIns/Analysis/CodeQuality/Src/MainWindow.xaml
@@ -10,7 +10,7 @@
         xmlns:tree="http://icsharpcode.net/sharpdevelop/treeview"
 	xmlns:local="clr-namespace:ICSharpCode.CodeQualityAnalysis"
         
-        Title="{Binding Title}"
+        Title="{Binding FrmTitle}"
        
         x:Name="root">
 	<!-- 
@@ -40,14 +40,14 @@ DataContext="{Binding RelativeSource={RelativeSource Self}}"
 		<ToolBarTray Background="White" Grid.Row="0">
 			<ToolBar>
 				<Button Name="btnOpenAssembly"
-				        Content="{Binding OpenAssembly}"
+				        Content="{Binding BtnOpenAssembly}"
 				        Click="btnOpenAssembly_Click" 
 				        Margin="0 0 5 0"></Button>
 			</ToolBar>
 		</ToolBarTray>
 			
 		<TabControl Grid.Row="1" IsEnabled="{Binding MainTabEnable}"> <!-- It is enabled once assembly is loaded. -->
-			<TabItem Header="{Binding DependencyGraph}">
+			<TabItem Header="{Binding TabDependencyGraph}">
 				<Grid>
 					<Grid.RowDefinitions>
 						<RowDefinition Height="Auto" />
@@ -107,10 +107,10 @@ DataContext="{Binding RelativeSource={RelativeSource Self}}"
 					           Grid.Column="4"  Grid.RowSpan="2" Padding="5" Background="LightBlue"/>
 				</Grid>
 			</TabItem>
-			<TabItem Header="Dependency Matrix">
+			<TabItem Header="{Binding TabDependencyMatrix}">
 				<Graph:TreeMatrixControl x:Name="matrixControl"></Graph:TreeMatrixControl>
 			</TabItem>
-			<TabItem Header="Metrics">
+			<TabItem Header="{Binding TabMetrics}">
 				<Grid>
 					<Grid.RowDefinitions>
 						<RowDefinition Height="Auto" />
diff --git a/src/AddIns/Analysis/CodeQuality/Src/MainWindowTranslationModel.cs b/src/AddIns/Analysis/CodeQuality/Src/MainWindowTranslationModel.cs
index e1c6a0f6af..1bf690c5c5 100644
--- a/src/AddIns/Analysis/CodeQuality/Src/MainWindowTranslationModel.cs
+++ b/src/AddIns/Analysis/CodeQuality/Src/MainWindowTranslationModel.cs
@@ -27,17 +27,27 @@ namespace ICSharpCode.CodeQualityAnalysis
 		
 		public MainWindowTranslationViewModel():base()
 		{
-			this.Title = "Code Quality Analysis";
-			this.OpenAssembly = "Open Assembly";
-			this.DependencyGraph = "Dependency Graph";
+			this.FrmTitle = "$Code Quality Analysis";
+			this.btnOpenAssembly = "$Open Assembly";
+			#region MainTab
+			this.TabDependencyGraph = "$Dependency Graph";
+			this.TabDependencyMatrix = "$Dependency Matrix";
+			this.TabMetrics = "$Metrics";
+			#endregion
+			
+			
 		}
 		
 		
-		public string Title {get;private set;}
+		public string FrmTitle {get;private set;}
 		
-		public string OpenAssembly {get; private set;}
+		public string btnOpenAssembly {get; private set;}
+		#region Main TabControl
+		public string TabDependencyGraph {get; private set;}
+		public string TabDependencyMatrix {get; private set;}
+		public string TabMetrics {get;private set;}
+		#endregion
 		
-		public string DependencyGraph {get; private set;}
 		
 		private string fileName;