diff --git a/.gitignore b/.gitignore
index a391e08..28244e0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,7 +1,7 @@
 build/
-wiringpi2.egg-info/
+*.egg-info/
 dist/
 __pycache__
 *.pyc
 wiringpi_wrap.c
-wiringpi2.py
+wiringpi.py
diff --git a/Makefile b/Makefile
index 6b1080b..08c1d7b 100644
--- a/Makefile
+++ b/Makefile
@@ -4,5 +4,9 @@ all: bindings
 bindings:
 	swig3.0 -python -threads wiringpi.i
 
+clean:
+	rm -rf build/
+	rm -rf dist/
+
 install:
 	sudo python setup.py install
diff --git a/setup.py b/setup.py
index 57dccac..0189589 100755
--- a/setup.py
+++ b/setup.py
@@ -9,15 +9,15 @@ sources += ['wiringpi_wrap.c']
 
 sources.remove('WiringPi/devLib/piFaceOld.c')
 
-_wiringpi2 = Extension(
-    '_wiringpi2',
+_wiringpi = Extension(
+    '_wiringpi',
     include_dirs=['WiringPi/wiringPi','WiringPi/devLib'],
     sources=sources
 )
 
 setup(
-    name = 'wiringpi2',
-    version = '2.32.0',
+    name = 'wiringpi',
+    version = '2.32.1',
     author = "Philip Howard",
     author_email = "phil@gadgetoid.com",
     url = 'https://github.com/WiringPi/WiringPi-Python/',
@@ -25,8 +25,8 @@ setup(
     easily interfacing with the GPIO pins of the Raspberry Pi. Also supports
     i2c and SPI""",
     long_description=open('README.md').read(),
-    ext_modules = [ _wiringpi2 ],
-    py_modules = ["wiringpi2"],
+    ext_modules = [ _wiringpi ],
+    py_modules = ["wiringpi"],
     install_requires=[],
     headers=glob('WiringPi/wiringPi/*.h')+glob('WiringPi/devLib/*.h')
 )
diff --git a/wiringpi2-class.py b/wiringpi-class.py
similarity index 100%
rename from wiringpi2-class.py
rename to wiringpi-class.py
diff --git a/wiringpi.i b/wiringpi.i
index a0d90b1..847ac76 100644
--- a/wiringpi.i
+++ b/wiringpi.i
@@ -1,4 +1,4 @@
-%module wiringpi2
+%module wiringpi
 
 %{
 #if PY_MAJOR_VERSION >= 3
@@ -283,4 +283,4 @@ static void wiringPiISRWrapper(int pin, int mode, PyObject *PyFunc);
 
 %include "bindings.i"
 %include "constants.py"
-%include "wiringpi2-class.py"
+%include "wiringpi-class.py"