diff --git a/CASA-auth-token/native/package/linux/CASA-auth-token-server-support.spec.in b/CASA-auth-token/native/package/linux/CASA_auth_token_native.spec.in
similarity index 82%
rename from CASA-auth-token/native/package/linux/CASA-auth-token-server-support.spec.in
rename to CASA-auth-token/native/package/linux/CASA_auth_token_native.spec.in
index 79726f4b..0c212f67 100644
--- a/CASA-auth-token/native/package/linux/CASA-auth-token-server-support.spec.in
+++ b/CASA-auth-token/native/package/linux/CASA_auth_token_native.spec.in
@@ -50,21 +50,21 @@ appplication invoke its services through the support modules provided to
 integrate with PAM or the Apache Web Server.
 
  
-%package -n CASA-auth-token-pam-support
+%package -n CASA_auth_token_pam_support
 Summary:      Libraries needed for PAM applications development.
 Group:        Applications/System
-Requires:     CASA-auth-token-server-support pam
+Requires:     CASA_auth_token_native pam
 
-%description -n CASA-auth-token-pam-support
+%description -n CASA_auth_token_pam_support
 This package contains the CASA (Common Authentication Services Adapter)
 authentication token infrastructure PAM module for token verification.
  
-%package -n CASA-auth-token-apache2_2-support
+%package -n CASA_auth_token_apache2_2_support
 Summary:      Libraries needed for Apache 2.2 applications development.
 Group:        Applications/System
-Requires:     apache2 CASA-auth-token-server-support
+Requires:     apache2 CASA_auth_token_native
 
-%description -n CASA-auth-token-apache2_2-support
+%description -n CASA_auth_token_apache2_2_support
 This package contains the CASA (Common Authentication Services Adapter)
 authentication token infrastructure Apache v2.2 authentication provider
 module for token verification. The module expects that users authenticate
@@ -72,12 +72,12 @@ utilizing the HTTP Basic authentication scheme and that the password utilized co
 of a CASA authentication token. Information about the authenticated identity is
 made available to other Apache modules via the Apache request environment variable.
 
-%package -n CASA-auth-token-devel
+%package -n CASA_auth_token_devel
 Summary:      Include files needed for applications development.
 Group:        Applications/System
-Requires:     CASA-devel CASA-auth-token-server-support CASA-auth-token-jaas-support CASA-auth-token-pam-support CASA-auth-token-apache2_2-support CASA-auth-token-service
+Requires:     CASA-devel CASA_auth_token_native CASA_auth_token_jaas_support CASA_auth_token_pam_support CASA_auth_token_apache2_2_support CASA_auth_token_service
 
-%description -n CASA-auth-token-devel
+%description -n CASA_auth_token_devel
 This package contains the files necessary for the development of client and
 server applications that utilize the CASA (Common Authentication Service Adapter)
 authentication token infrastructure for authentication.
@@ -110,7 +110,7 @@ install -d %{buildroot}%{prefix}/%{_lib}
 install -d %{buildroot}%{prefix}/%{_lib}/security
 install -d %{buildroot}%{prefix}/include
 
-## CASA-auth-token-server-support ##
+## CASA_auth_token_native ##
 # Libs
 install -m 755 %{_lib}/%{cfg}/libcasa_s_authtoken.so %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so.%{bldno}
 
@@ -118,7 +118,7 @@ install -m 755 %{_lib}/%{cfg}/libcasa_s_authtoken.so %{buildroot}%{prefix}/%{_li
 ln -sf libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so
 ln -sf libcasa_s_authtoken.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/libcasa_s_authtoken.so.1
 
-## CASA-auth-token-pam-support ##
+## CASA_auth_token_pam_support ##
 # Libs
 install -m 755 %{_lib}/%{cfg}/pam_casaauthtok.so %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so.%{bldno}
 #install -m 755 %{_lib}/%{cfg}/pam_casaauthtok.so %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so
@@ -127,7 +127,7 @@ install -m 755 %{_lib}/%{cfg}/pam_casaauthtok.so %{buildroot}%{prefix}/%{_lib}/s
 ln -sf pam_casaauthtok.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so
 ln -sf pam_casaauthtok.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/security/pam_casaauthtok.so.1
 
-## CASA-auth-token-apache2_2-support ##
+## CASA_auth_token_apache2_2_support ##
 # Libs
 install -m 755 %{_lib}/%{cfg}/mod_authn_casa.so %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.%{bldno}
 
@@ -135,7 +135,7 @@ install -m 755 %{_lib}/%{cfg}/mod_authn_casa.so %{buildroot}%{prefix}/%{_lib}/mo
 ln -sf mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so
 ln -sf mod_authn_casa.so.%{bldno} %{buildroot}%{prefix}/%{_lib}/mod_authn_casa.so.1
 
-## CASA-auth-token-devel ##
+## CASA_auth_token_devel ##
 # Header Files
 install -m 644 include/casa_c_authtoken.h %{buildroot}%{prefix}/include
 install -m 644 include/casa_s_authtoken.h %{buildroot}%{prefix}/include
@@ -145,7 +145,7 @@ install -m 644 include/casa_s_authtoken.h %{buildroot}%{prefix}/include
 rm -rf $RPM_BUILD_ROOT
 
 
-## CASA-auth-token-server-support ##
+## CASA_auth_token_native ##
 %pre
 # Nothing to do in this pre script
 
@@ -165,20 +165,20 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/%{_lib}/libcasa_s_authtoken.so.1
 
 
-## CASA-auth-token-pam-support ##
-%pre -n CASA-auth-token-pam-support
+## CASA_auth_token_pam_support ##
+%pre -n CASA_auth_token_pam_support
 # Nothing to do in this pre script
 
-%post -n CASA-auth-token-pam-support
+%post -n CASA_auth_token_pam_support
 /sbin/ldconfig
 
-%preun -n CASA-auth-token-pam-support
+%preun -n CASA_auth_token_pam_support
 # Nothing to do in this preun script
 
-%postun -n CASA-auth-token-pam-support
+%postun -n CASA_auth_token_pam_support
 # Nothing to do in this postun script
 
-%files -n CASA-auth-token-pam-support
+%files -n CASA_auth_token_pam_support
 %defattr(-,root,root)
 %dir %{prefix}/%{_lib}/security
 %{prefix}/%{_lib}/security/pam_casaauthtok.so.%{bldno}
@@ -186,40 +186,40 @@ rm -rf $RPM_BUILD_ROOT
 %{prefix}/%{_lib}/security/pam_casaauthtok.so.1
 
 
-## CASA-auth-token-apache2_2-support ##
-%pre -n CASA-auth-token-apache2_2-support
+## CASA_auth_token_apache2_2_support ##
+%pre -n CASA_auth_token_apache2_2_support
 # Nothing to do in this pre script
 
-%post -n CASA-auth-token-apache2_2-support
+%post -n CASA_auth_token_apache2_2_support
 /sbin/ldconfig
 
-%preun -n CASA-auth-token-apache2_2-support
+%preun -n CASA_auth_token_apache2_2_support
 # Nothing to do in this preun script
 
-%postun -n CASA-auth-token-apache2_2-support
+%postun -n CASA_auth_token_apache2_2_support
 # Nothing to do in this postun script
 
-%files -n CASA-auth-token-apache2_2-support
+%files -n CASA_auth_token_apache2_2_support
 %defattr(-,root,root)
 %{prefix}/%{_lib}/mod_authn_casa.so.%{bldno}
 %{prefix}/%{_lib}/mod_authn_casa.so
 %{prefix}/%{_lib}/mod_authn_casa.so.1
 
 
-## CASA-auth-token-devel ##
-%pre -n CASA-auth-token-devel
+## CASA_auth_token_devel ##
+%pre -n CASA_auth_token_devel
 # Nothing to do in this pre script
 
-%post -n CASA-auth-token-devel
+%post -n CASA_auth_token_devel
 # Nothing to do in this post script
 
-%preun -n CASA-auth-token-devel
+%preun -n CASA_auth_token_devel
 # Nothing to do in this preun script
 
-%postun -n CASA-auth-token-devel
+%postun -n CASA_auth_token_devel
 # Nothing to do in this postun script
 
-%files -n CASA-auth-token-devel
+%files -n CASA_auth_token_devel
 %defattr(-,root,root)
 %{prefix}/include/casa_c_authtoken.h
 %{prefix}/include/casa_s_authtoken.h