diff --git a/src/ui/AttackTreePanel.java b/src/ui/AttackTreePanel.java
index 489175e59ea9c79ca81e693befcc3eb9fcdab361..6d8020fec139bdec9207fb0c64fa3c710d7a6f98 100755
--- a/src/ui/AttackTreePanel.java
+++ b/src/ui/AttackTreePanel.java
@@ -56,7 +56,7 @@ import java.util.*;
 public class AttackTreePanel extends TURTLEPanel {
     public AttackTreeDiagramPanel atdp;
     
-    public RequirementPanel(MainGUI _mgui) {
+    public AttackTreePanel(MainGUI _mgui) {
         super(_mgui);
 		
         tabbedPane = new JTabbedPane();
@@ -84,7 +84,7 @@ public class AttackTreePanel extends TURTLEPanel {
     }
     
     public boolean addAttackTreeDiagram(String s) {
-        AttackTreeDiagramToolBar toolBarAt = new AttackTreeDiagramToolBar(mgui);
+        AttackTreeDiagramToolbar toolBarAt = new AttackTreeDiagramToolbar(mgui);
         toolbars.add(toolBarAt);
         
         toolBarPanel = new JPanel();
@@ -93,7 +93,7 @@ public class AttackTreePanel extends TURTLEPanel {
 		//toolBarPanel.setBackground(ColorManager.MainTabbedPaneSelect);
         
         //The diagram
-        atdp = new AttackTreeDiagramPanel(mgui, toolBarReq);
+        atdp = new AttackTreeDiagramPanel(mgui, toolBarAt);
         atdp.setName(s);
         atdp.tp = this;
         tdp = atdp;
diff --git a/src/ui/atd/AttackTreeDiagramToolbar.java b/src/ui/atd/AttackTreeDiagramToolbar.java
index 119dabb657e4ebf228457c140a118fbee8a76d06..f9ef6acf76837d1f3ea9c78539e66b49f7f22e3c 100755
--- a/src/ui/atd/AttackTreeDiagramToolbar.java
+++ b/src/ui/atd/AttackTreeDiagramToolbar.java
@@ -52,9 +52,9 @@ import javax.swing.*;
 
 import ui.*;
 
-public class AttackTreeDiagramToolBar extends TToolBar {
+public class AttackTreeDiagramToolbar extends TToolBar {
     
-    public AttackTreeToolBar(MainGUI _mgui) {
+    public AttackTreeDiagramToolbar(MainGUI _mgui) {
         super(_mgui);
         
     }