diff --git a/yast2-CASA/src/CASA_auto.ycp b/yast2-CASA/src/CASA_auto.ycp
index bc329c53..76a746de 100644
--- a/yast2-CASA/src/CASA_auto.ycp
+++ b/yast2-CASA/src/CASA_auto.ycp
@@ -5,7 +5,7 @@
  * Authors:	casa <casa@novell.com>
  *
  *********************************************************************
- * Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
+ * Copyright (C) 2005-2007 Novell, Inc. All Rights Reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/yast2-CASA/src/CASA_proposal.ycp b/yast2-CASA/src/CASA_proposal.ycp
index e6f132ce..ed5846d7 100644
--- a/yast2-CASA/src/CASA_proposal.ycp
+++ b/yast2-CASA/src/CASA_proposal.ycp
@@ -5,7 +5,7 @@
  * Authors:	casa <casa@novell.com>
  *
  *********************************************************************
- * Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
+ * Copyright (C) 2005-2007 Novell, Inc. All Rights Reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
diff --git a/yast2-CASA/src/complex.ycp b/yast2-CASA/src/complex.ycp
index 7d6f9466..aed04dd8 100644
--- a/yast2-CASA/src/complex.ycp
+++ b/yast2-CASA/src/complex.ycp
@@ -5,7 +5,7 @@
  * Authors:	casa <casa@novell.com>
  *
  *********************************************************************
- * Copyright (C) 2005-2006 Novell, Inc. All Rights Reserved.
+ * Copyright (C) 2005-2007 Novell, Inc. All Rights Reserved.
  *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
@@ -105,10 +105,12 @@ any SummaryDialog()
 	`VBox(
 		`VSpacing(),
 		`VSpacing(),
-		`PushButton(`id(`install_casa_button),`opt(`default), _("&Configure CASA")),
+//		`PushButton(`id(`install_casa_button),`opt(`default), _("&Configure CASA")),
+		`PushButton(`id(`install_casa_button),`opt(`default), _("&Enable CASA")),
 		`VSpacing(),
 		`VSpacing(),
-		`PushButton(`id(`uninstall_casa_button),`opt(`default), _("&Unconfigure CASA")),
+//		`PushButton(`id(`uninstall_casa_button),`opt(`default), _("&Unconfigure CASA")),
+		`PushButton(`id(`uninstall_casa_button),`opt(`default), _("&Disable CASA")),
 		`VSpacing(),
 		`VSpacing()
 		));
@@ -181,7 +183,8 @@ any SummaryDialog()
 			if(iInstall_CASAReturn == 0)
 			{
 				y2milestone(sformat("SummaryDialog() SCR::Execute(.target.bash, /usr/sbin/installcasa) returned: %1",iInstall_CASAReturn));
-				Popup::Message(sformat("YaST Configured CASA successfully."));
+//				Popup::Message(sformat("YaST Configured CASA successfully."));
+				Popup::Message(sformat("YaST Enableded CASA successfully."));
 			
 			}        
 			else if(iInstall_CASAReturn == 127)
@@ -214,7 +217,8 @@ any SummaryDialog()
 			if(iUninstall_CASAReturn == 0)
 			{
 				y2milestone(sformat("SummaryDialog() SCR::Execute(.target.bash, /usr/sbin/uninstallcasa) returned: %1",iUninstall_CASAReturn));
-				Popup::Message(sformat("YaST Unconfigured CASA successfully."));
+//				Popup::Message(sformat("YaST Unconfigured CASA successfully."));
+				Popup::Message(sformat("YaST Disabled CASA successfully."));
 			}
 			else if(iUninstall_CASAReturn == 127)
 			{