diff --git a/c_micasad/startup/casaucfgpam b/c_micasad/startup/casaucfgpam
index 30d4c6fd..b1a1b3d8 100644
--- a/c_micasad/startup/casaucfgpam
+++ b/c_micasad/startup/casaucfgpam
@@ -1,6 +1,4 @@
 #!/bin/bash
-#disable the service
-insserv -r /etc/init.d/micasad
 # Remove the CASA pam entries from pam files.
 for pam_file in "/etc/pam.d/login" "/etc/pam.d/sshd" "/etc/pam.d/xdm" "/etc/pam.d/gdm" "/etc/pam.d/kdm"
 do
diff --git a/casa-yast/src/complex.ycp b/casa-yast/src/complex.ycp
index 83eedc48..1e78d225 100644
--- a/casa-yast/src/complex.ycp
+++ b/casa-yast/src/complex.ycp
@@ -144,16 +144,16 @@ any SummaryDialog() {
 
 	    // launch the install script here
 		y2milestone ("SummaryDialog() launch the install script");
-		integer iInstall_CASAReturn = (integer)SCR::Execute(.target.bash, "/usr/sbin/casacfgpam");
+		integer iInstall_CASAReturn = (integer)SCR::Execute(.target.bash, "/usr/sbin/installcasa");
 		if(iInstall_CASAReturn == 0)
 		{
-			y2milestone(sformat("SummaryDialog() SCR::Execute(.target.bash, /usr/sbin/casacfgpam) returned: %1",iInstall_CASAReturn));
+			y2milestone(sformat("SummaryDialog() SCR::Execute(.target.bash, /usr/sbin/installcasa) returned: %1",iInstall_CASAReturn));
  			Popup::Message(sformat("YaST Configured CASA successfully."));
        		
 		}        
 		else if(iInstall_CASAReturn == 127)
 		{
-			Popup::Error(sformat("YaST was unable to find the casacfgpam script."));
+			Popup::Error(sformat("YaST was unable to find the installcasa script."));
 		}
 		else
 		{
@@ -164,15 +164,15 @@ any SummaryDialog() {
 	else if(ret == `uninstall_casa_button) {
 	    // launch the uninstall script here
 		y2milestone ("SummaryDialog() launch the uninstall script");
-		integer iUninstall_CASAReturn = (integer)SCR::Execute(.target.bash, "/usr/sbin/casaucfgpam");
+		integer iUninstall_CASAReturn = (integer)SCR::Execute(.target.bash, "/usr/sbin/uninstallcasa");
 		if(iUninstall_CASAReturn == 0)
 		{
-			y2milestone(sformat("SummaryDialog() SCR::Execute(.target.bash, /usr/sbin/casaucfgpam) returned: %1",iUninstall_CASAReturn));
+			y2milestone(sformat("SummaryDialog() SCR::Execute(.target.bash, /usr/sbin/uninstallcasa) returned: %1",iUninstall_CASAReturn));
  			Popup::Message(sformat("YaST Unconfigured CASA successfully."));
 		}
 		else if(iUninstall_CASAReturn == 127)
 		{
-			Popup::Error(sformat("YaST was unable to find the casaucfgpam script."));
+			Popup::Error(sformat("YaST was unable to find the uninstallcasa script."));
 		}
 		else
 		{
diff --git a/casa-yast/src/dialogs.ycp b/casa-yast/src/dialogs.ycp
index 265259a9..a75161d5 100644
--- a/casa-yast/src/dialogs.ycp
+++ b/casa-yast/src/dialogs.ycp
@@ -44,7 +44,7 @@ include "CASA/helps.ycp";
 any Configure1Dialog () {
 
     /* NovellCasa configure1 dialog caption */
-    string caption = _("Novell CASA Configuration");
+    string caption = _("CASA Configuration");
 
     /* NovellCasa configure1 dialog contents */
     term contents = `Label (_("First part of configuration of CASA"));
@@ -81,7 +81,7 @@ any Configure1Dialog () {
 any Configure2Dialog () {
 
     /* NovellCasa configure2 dialog caption */
-    string caption = _("Novell CASA Configuration");
+    string caption = _("CASA Configuration");
 
     /* NovellCasa configure2 dialog contents */
     term contents = `Label (_("Second part of configuration of CASA"));
diff --git a/casa-yast/src/helps.ycp b/casa-yast/src/helps.ycp
index 0cad7e3e..bdd5949d 100644
--- a/casa-yast/src/helps.ycp
+++ b/casa-yast/src/helps.ycp
@@ -59,7 +59,7 @@ An additional dialog informs whether it is safe to do so.
 "),
 
     /* Summary dialog help 1/3 */
-    "summary" : _("<p><b><big>Novell CASA Configuration</big></b><br>
+    "summary" : _("<p><b><big>CASA Configuration</big></b><br>
 Configure CASA here.<br></p>
 ") +
 
@@ -77,7 +77,7 @@ the configuration opens.</p>
 "),
 
     /* Ovreview dialog help 1/3 */
-    "overview" : _("<p><b><big>Novell CASA Configuration Overview</big></b><br>
+    "overview" : _("<p><b><big>CASA Configuration Overview</big></b><br>
 Obtain an overview of installed CASA. Additionally
 edit their configuration.<br></p>
 ") +