diff --git a/NetworkManager-openswan.spec b/NetworkManager-libreswan.spec
similarity index 84%
rename from NetworkManager-openswan.spec
rename to NetworkManager-libreswan.spec
index bfafcf7..cf1367a 100644
--- a/NetworkManager-openswan.spec
+++ b/NetworkManager-libreswan.spec
@@ -2,14 +2,14 @@
 %global nm_version        1:1.2.0-0.3
 %global nma_version       1.1.0
 
-Summary:   NetworkManager VPN plug-in for openswan and libreswan
-Name:      NetworkManager-openswan
+Summary:   NetworkManager VPN plug-in for IPsec VPN
+Name:      NetworkManager-libreswan
 Version:   1.2.0
 Release:   0.1%{?snapshot}%{?dist}
 License:   GPLv2+
 URL:       http://www.gnome.org/projects/NetworkManager/
 Group:     System Environment/Base
-Source0:   https://download.gnome.org/sources/NetworkManager-openswan/1.2/%{name}-%{version}.tar.xz
+Source0:   https://download.gnome.org/sources/NetworkManager-libreswan/1.2/%{name}-%{version}.tar.xz
 
 BuildRequires: gtk3-devel
 BuildRequires: libnl3-devel
@@ -28,24 +28,30 @@ Requires: dbus
 Requires: libreswan
 Requires: shared-mime-info
 
-%global _privatelibs libnm-openswan-properties[.]so.*
+Provides: NetworkManager-openswan = %{version}-%{release}
+Obsoletes: NetworkManager-openswan < %{version}-%{release}
+
+%global _privatelibs libnm-libreswan-properties[.]so.*
 %global __provides_exclude ^(%{_privatelibs})$
 %global __requires_exclude ^(%{_privatelibs})$
 
 %description
-This package contains software for integrating the openswan/libreswan VPN software
+This package contains software for integrating the libreswan VPN software
 with NetworkManager and the GNOME desktop
 
-%package -n NetworkManager-openswan-gnome
-Summary: NetworkManager VPN plugin for openswan/libreswan - GNOME files
+%package -n NetworkManager-libreswan-gnome
+Summary: NetworkManager VPN plugin for libreswan - GNOME files
 Group:   System Environment/Base
 
 Requires: %{name}%{?_isa} = %{version}-%{release}
 Requires: nm-connection-editor
 
-%description -n NetworkManager-openswan-gnome
+Provides: NetworkManager-openswan-gnome = %{version}-%{release}
+Obsoletes: NetworkManager-openswan-gnome < %{version}-%{release}
+
+%description -n NetworkManager-libreswan-gnome
 This package contains software for integrating VPN capabilities with
-the openswan/libreswan server with NetworkManager (GNOME files).
+the libreswan server with NetworkManager (GNOME files).
 
 %prep
 %setup -q
@@ -60,7 +66,6 @@ make %{?_smp_mflags}
 %install
 make install DESTDIR=%{buildroot}
 rm -f %{buildroot}%{_libdir}/NetworkManager/lib*.la
-ln -sf %{_libexecdir}/nm-openswan-service-helper  %{buildroot}%{_libexecdir}/nm-libreswan-service-helper
 
 %find_lang %{name}
 
@@ -71,25 +76,25 @@ update-desktop-database &> /dev/null || :
 update-desktop-database &> /dev/null || :
 
 %files -f %{name}.lang
-%{_libexecdir}/nm-openswan-auth-dialog
-%{_sysconfdir}/dbus-1/system.d/nm-openswan-service.conf
-%{_prefix}/lib/NetworkManager/VPN/nm-openswan-service.name
-%{_libexecdir}/nm-openswan-service
-%{_libexecdir}/nm-openswan-service-helper
+%{_libexecdir}/nm-libreswan-auth-dialog
+%{_sysconfdir}/dbus-1/system.d/nm-libreswan-service.conf
+%{_prefix}/lib/NetworkManager/VPN/nm-libreswan-service.name
+%{_libexecdir}/nm-libreswan-service
 %{_libexecdir}/nm-libreswan-service-helper
-%{_datadir}/applications/nm-openswan-auth-dialog.desktop
+%{_libexecdir}/nm-openswan-service-helper
+%{_datadir}/applications/nm-libreswan-auth-dialog.desktop
 %doc AUTHORS ChangeLog NEWS
 %license COPYING
 
-%files -n NetworkManager-openswan-gnome
+%files -n NetworkManager-libreswan-gnome
 %{_libdir}/NetworkManager/lib*.so*
-%dir %{_datadir}/gnome-vpn-properties/openswan
-%{_datadir}/gnome-vpn-properties/openswan/nm-openswan-dialog.ui
-%{_sysconfdir}/NetworkManager/VPN/nm-openswan-service.name
+%dir %{_datadir}/gnome-vpn-properties/libreswan
+%{_datadir}/gnome-vpn-properties/libreswan/nm-libreswan-dialog.ui
+%{_sysconfdir}/NetworkManager/VPN/nm-libreswan-service.name
 
 
 %changelog
-* Fri Oct 28 2015 Lubomir Rintel <lkundrak@v3.sk> - 1.2.0-0.1.20151028git3caa645
+* Fri Oct 23 2015 Lubomir Rintel <lkundrak@v3.sk> - 1.2.0-0.1.20151023git8a39c0f
 - Update to a newer git snapshot
 
 * Tue Sep 1 2015 Lubomir Rintel <lkundrak@v3.sk> - 1.2.0-0.1.20150901git92f1611
@@ -218,7 +223,7 @@ Resolves: #845599, #865883
 
 * Tue Sep 7 2010 Avesh Agarwal <avagarwa@redhat.com> - 0.8.0-6.20100411git
 - Modified import and export interfaces to import_from_file and export_to_file, respectively,
-  due to changes in NMVpnPluginUiInterface struct in NM (bz 631159). 
+  due to changes in NMVpnPluginUiInterface struct in NM (bz 631159).
 
 * Mon Jul 26 2010 Avesh Agarwal <avagarwa@redhat.com> - 0.8.0-5.20100411git
 Resolves: #616910
@@ -231,14 +236,14 @@ Resolves: #616910
 - Fix to delete the secret file as soon as read by Openswan
 
 * Thu Jul 8 2010 Avesh Agarwal <avagarwa@redhat.com> - 0.8.0-3.20100411git
-- Modified the patch so that it does not pass user password to 
-  "ipsec whack" command.   
+- Modified the patch so that it does not pass user password to
+  "ipsec whack" command.
 
 * Thu Jul 8 2010 Avesh Agarwal <avagarwa@redhat.com> - 0.8.0-2.20100411git
 - Modified to initiate VPN connections with openswan whack interface
-- Fixed the issue of world readable conf and secret files 
+- Fixed the issue of world readable conf and secret files
 - Cleaned conf and secret files after VPN connection is stopped
-- Fixed the issue of storing sensitive information like user 
+- Fixed the issue of storing sensitive information like user
   password in a file (rhbz# 607352)
 - Changed PLUTO_SERVERBANNER to PLUTO_PEER_BANNER due
   to the same change in Openswan