diff --git a/network/C-IP2Location/README b/network/ip2location-c/README
similarity index 100%
rename from network/C-IP2Location/README
rename to network/ip2location-c/README
diff --git a/network/C-IP2Location/C-IP2Location.SlackBuild b/network/ip2location-c/ip2location-c.SlackBuild
similarity index 92%
rename from network/C-IP2Location/C-IP2Location.SlackBuild
rename to network/ip2location-c/ip2location-c.SlackBuild
index 5548fe76e8..2bd2be1d16 100644
--- a/network/C-IP2Location/C-IP2Location.SlackBuild
+++ b/network/ip2location-c/ip2location-c.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-# Slackware build script for C-IP2Location
-# Copyright 2011  Chris Abela, Malta
+# Slackware build script for ip2location-c
+# Copyright 2012  Chris Abela, Malta
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -21,8 +21,7 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-PRGNAM=C-IP2Location
-SRCNAM=ip2location-c
+PRGNAM=ip2location-c  # Previously known as C-IP2Location
 VERSION=${VERSION:-4.0.2}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
@@ -59,9 +58,9 @@ set -e
 rm -rf $PKG
 mkdir -p $TMP $PKG $OUTPUT
 cd $TMP
-rm -rf $SRCNAM-$VERSION
-tar xvf $CWD/$SRCNAM-$VERSION.tar.gz
-cd $SRCNAM-$VERSION
+rm -rf $PRGNAM-$VERSION
+tar xvf $CWD/$PRGNAM-$VERSION.tar.gz
+cd $PRGNAM-$VERSION
 chown -R root:root .
 find . \
  \( -perm 777 -o -perm 775 -o -perm 711 -o -perm 555 -o -perm 511 \) \
diff --git a/network/C-IP2Location/C-IP2Location.info b/network/ip2location-c/ip2location-c.info
similarity index 82%
rename from network/C-IP2Location/C-IP2Location.info
rename to network/ip2location-c/ip2location-c.info
index 5a6ced6ea6..de6b569a29 100644
--- a/network/C-IP2Location/C-IP2Location.info
+++ b/network/ip2location-c/ip2location-c.info
@@ -1,4 +1,4 @@
-PRGNAM="C-IP2Location"
+PRGNAM="ip2location-c"
 VERSION="4.0.2"
 HOMEPAGE="http://www.ip2location.com/c.aspx"
 DOWNLOAD="http://www.ip2location.com/downloads/ip2location-c-4.0.2.tar.gz"
@@ -7,4 +7,4 @@ DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""
 MAINTAINER="Chris Abela"
-EMAIL="chris.abela@maltats.com"
+EMAIL="kristofru@gmail.com"
diff --git a/network/C-IP2Location/slack-desc b/network/ip2location-c/slack-desc
similarity index 51%
rename from network/C-IP2Location/slack-desc
rename to network/ip2location-c/slack-desc
index 8bca2fab24..e041553a1d 100644
--- a/network/C-IP2Location/slack-desc
+++ b/network/ip2location-c/slack-desc
@@ -6,14 +6,14 @@
 # customary to leave one space after the ':' except on otherwise blank lines.
 
              |-----handy-ruler------------------------------------------------------|
-C-IP2Location: C-IP2Location (Geo IP library)
-C-IP2Location:
-C-IP2Location: IP2Location is a C library that enables the user to find the
-C-IP2Location: country, region, city, latitude, longitude, zip code, time zone,
-C-IP2Location: ISP, domain name, connection type, area code, weather, mobile
-C-IP2Location: network by IP address or hostname originates from.  It contains
-C-IP2Location: a demo IP2Location IP-COUNTRY BIN database which consists of
-C-IP2Location: real data for IP address range 0.0.0.0 to 99.255.255.255.
-C-IP2Location:
-C-IP2Location: Homepage: http://www.ip2location.com/c.aspx
-C-IP2Location:
+ip2location-c: ip2location-c (Geo IP library)
+ip2location-c:
+ip2location-c: IP2Location is a C library that enables the user to find the
+ip2location-c: country, region, city, latitude, longitude, zip code, time zone,
+ip2location-c: ISP, domain name, connection type, area code, weather, mobile
+ip2location-c: network by IP address or hostname originates from.  It contains
+ip2location-c: a demo IP2Location IP-COUNTRY BIN database which consists of
+ip2location-c: real data for IP address range 0.0.0.0 to 99.255.255.255.
+ip2location-c:
+ip2location-c: Homepage: http://www.ip2location.com/c.aspx
+ip2location-c: