--- a/LightClone/Source/World.cpp	Fri Sep 30 20:26:44 2011 -0700
+++ b/LightClone/Source/World.cpp	Fri Sep 30 22:39:08 2011 -0700
@@ -221,7 +221,7 @@
 		pBackground->SetPosition(ScreenSizeX - pBackground->GetWidth(), 0.0f);
 		pBackground->SetDepth(512.0f);
 
-		pToolbar = new CodePanel(4, 2);
+		pToolbar = new ProgramPanel(4, 2);
 		pToolbar->Initialize(pResourceManager);
 		pToolbar->SetTexture("Data\\Textures\\PanelA.png");
 		pToolbar->SetPosition(16, 16.0f);
@@ -243,11 +243,11 @@
 		pMainLabel->SetPosition(26.0f, 149.0f);
 		pMainLabel->SetDepth(256.0f);
 
-		pCode[0] = new CodePanel(4, 3);
+		pCode[0] = new ProgramPanel(4, 3);
 		pCode[0]->Initialize(pResourceManager);
 		pCode[0]->SetTexture("Data\\Textures\\PanelB.png");
 		pCode[0]->SetPosition(16.0f, 160.0f);
-		pCode[0]->Subscribe(CodePanel::EventAction, &World::OnAction, this);
+		pCode[0]->Subscribe(ProgramPanel::EventAction, &World::OnAction, this);
 		pCode[0]->SetDepth(256.0f);
 
 		GuiLabel* pFunctionALabel = new GuiLabel();
@@ -257,11 +257,11 @@
 		pFunctionALabel->SetColor(D3DCOLOR_XRGB(0, 0, 0));
 		pFunctionALabel->SetPosition(26.0f, 349.0f);
 
-		pCode[1] = new CodePanel(4, 2);
+		pCode[1] = new ProgramPanel(4, 2);
 		pCode[1]->Initialize(pResourceManager);
 		pCode[1]->SetTexture("Data\\Textures\\PanelA.png");
 		pCode[1]->SetPosition(16.0f, 360.0f);
-		pCode[1]->Subscribe(CodePanel::EventAction, &World::OnAction, this);
+		pCode[1]->Subscribe(ProgramPanel::EventAction, &World::OnAction, this);
 
 		GuiLabel* pFunctionBLabel = new GuiLabel();
 		pFunctionBLabel->Initialize(pResourceManager);
@@ -270,11 +270,11 @@
 		pFunctionBLabel->SetColor(D3DCOLOR_XRGB(0, 0, 0));
 		pFunctionBLabel->SetPosition(26.0f, 493.0f);
 
-		pCode[2] = new CodePanel(4, 2);
+		pCode[2] = new ProgramPanel(4, 2);
 		pCode[2]->Initialize(pResourceManager);
 		pCode[2]->SetTexture("Data\\Textures\\PanelA.png");
 		pCode[2]->SetPosition(16.0f, 504.0f);
-		pCode[2]->Subscribe(CodePanel::EventAction, &World::OnAction, this);
+		pCode[2]->Subscribe(ProgramPanel::EventAction, &World::OnAction, this);
 
 		const float fButtonPadding	= 32.0f;
 		const float fButtonSpacing	= 8.0f;
@@ -507,7 +507,7 @@
 		{
 			kProgram.Clear();
 
-			for(uint32 i = 0; i < MaximumCodePanels; ++i)
+			for(uint32 i = 0; i < MaximumFunctionCount; ++i)
 			{
 				pCode[i]->Clear();
 			}
@@ -553,7 +553,7 @@
 {
 	ActionArguments& kActionArguments = (ActionArguments&)kArguments;
 
-	for(uint32 i = 0; i < MaximumCodePanels; ++i)
+	for(uint32 i = 0; i < MaximumFunctionCount; ++i)
 	{
 		if(kArguments.pSource == pCode[i])
 		{
@@ -604,7 +604,7 @@
 {
 	kProgram.Clear();
 
-	for(uint32 i = 0; i < MaximumCodePanels; ++i)
+	for(uint32 i = 0; i < MaximumFunctionCount; ++i)
 	{
 		pCode[i]->Clear();
 	}