diff --git a/MANIFEST.in b/MANIFEST.in
index f8cf309..27c23fa 100644
--- a/MANIFEST.in
+++ b/MANIFEST.in
@@ -1,5 +1,5 @@
-graft wiringOP/wiringPi
-graft wiringOP/devLib
+graft wiringPi/wiringPi
+graft wiringPi/devLib
 include README.rst
 include LICENSE.txt
 include setup.cfg
diff --git a/examples/ds1307.py b/examples/ds1307.py
index 6e77f0e..9c637ce 100644
--- a/examples/ds1307.py
+++ b/examples/ds1307.py
@@ -6,7 +6,7 @@ import operator
 import argparse
 
 parser = argparse.ArgumentParser(description='i2c')
-parser.add_argument("--device", type=str, default="/dev/i2c-0", help='specify the i2c node')
+parser.add_argument("--device", type=str, default="/dev/i2c-2", help='specify the i2c node')
 args = parser.parse_args()
 
 i2caddr = 0x68
diff --git a/generate-bindings.py b/generate-bindings.py
index 3ca6b21..4124bc9 100644
--- a/generate-bindings.py
+++ b/generate-bindings.py
@@ -21,7 +21,7 @@ print("// Generated by generate-bindings.py - do not edit manually!")
 
 for file in HEADERS:
     print("\n// Header file {}".format(file))
-    if file == "wiringOP/devLib/font.h":
+    if file == "wiringPi/devLib/font.h":
         continue    # continue here
     h = open(file).read().split('\n')
     extern = False
diff --git a/setup.py b/setup.py
index 3cd50f1..ab16c0b 100755
--- a/setup.py
+++ b/setup.py
@@ -9,13 +9,13 @@ from glob import glob
 from subprocess import Popen, PIPE
 import re
 
-sources = glob('wiringOP/devLib/*.c')
-sources += ['wiringOP/examples/blink.c']
-sources += glob('wiringOP/wiringPi/*.c')
+sources = glob('wiringPi/devLib/*.c')
+sources += ['wiringPi/examples/blink.c']
+sources += glob('wiringPi/wiringPi/*.c')
 sources += ['wiringpi.i']
 sources += ['fixUndefFunc.c']
 try:
-    sources.remove('wiringOP/devLib/piFaceOld.c')
+    sources.remove('wiringPi/devLib/piFaceOld.c')
 except ValueError:
     # the file is already excluded in the source distribution
     pass
@@ -44,7 +44,7 @@ class sdist_ext_first(sdist):
 
 _wiringpi = Extension(
     '_wiringpi',
-    include_dirs=['wiringOP', 'wiringOP/wiringPi', 'wiringOP/devLib'],
+    include_dirs=['wiringPi', 'wiringPi/wiringPi', 'wiringPi/devLib'],
     swig_opts=['-threads'],
     extra_link_args=['-lcrypt', '-lrt'],
     sources=sources
diff --git a/wiringpi.i b/wiringpi.i
index 11fd609..3d44692 100644
--- a/wiringpi.i
+++ b/wiringpi.i
@@ -6,51 +6,51 @@
 #define PyString_FromStringAndSize PyBytes_FromStringAndSize
 #endif
 
-#include "wiringOP/wiringPi/wiringPi.h"
-#include "wiringOP/wiringPi/wiringPiI2C.h"
-#include "wiringOP/wiringPi/wiringPiSPI.h"
-#include "wiringOP/wiringPi/wiringSerial.h"
-#include "wiringOP/wiringPi/wiringShift.h"
-#include "wiringOP/wiringPi/drcSerial.h"
-#include "wiringOP/wiringPi/ads1115.h"
-#include "wiringOP/wiringPi/max31855.h"
-#include "wiringOP/wiringPi/max5322.h"
-#include "wiringOP/wiringPi/mcp23008.h"
-#include "wiringOP/wiringPi/mcp23016.h"
-#include "wiringOP/wiringPi/mcp23016reg.h"
-#include "wiringOP/wiringPi/mcp23017.h"
-#include "wiringOP/wiringPi/mcp23s08.h"
-#include "wiringOP/wiringPi/mcp23s17.h"
-#include "wiringOP/wiringPi/mcp23x0817.h"
-#include "wiringOP/wiringPi/mcp23x08.h"
-#include "wiringOP/wiringPi/mcp3002.h"
-#include "wiringOP/wiringPi/mcp3004.h"
-#include "wiringOP/wiringPi/mcp3422.h"
-#include "wiringOP/wiringPi/mcp4802.h"
-#include "wiringOP/wiringPi/pcf8574.h"
-#include "wiringOP/wiringPi/pcf8591.h"
-#include "wiringOP/wiringPi/sn3218.h"
-#include "wiringOP/wiringPi/softPwm.h"
-#include "wiringOP/wiringPi/softServo.h"
-#include "wiringOP/wiringPi/softTone.h"
-#include "wiringOP/wiringPi/sr595.h"
-#include "wiringOP/wiringPi/bmp180.h"
-#include "wiringOP/wiringPi/drcNet.h"
-#include "wiringOP/wiringPi/ds18b20.h"
-#include "wiringOP/wiringPi/htu21d.h"
-#include "wiringOP/wiringPi/pseudoPins.h"
-#include "wiringOP/wiringPi/rht03.h"
-#include "wiringOP/wiringPi/wpiExtensions.h"
-#include "wiringOP/devLib/ds1302.h"
-#include "wiringOP/devLib/font.h"
-#include "wiringOP/devLib/gertboard.h"
-#include "wiringOP/devLib/lcd128x64.h"
-#include "wiringOP/devLib/lcd.h"
-#include "wiringOP/devLib/maxdetect.h"
-#include "wiringOP/devLib/piGlow.h"
-#include "wiringOP/devLib/piNes.h"
-#include "wiringOP/devLib/scrollPhat.h"
-#include "wiringOP/devLib/piFace.h"
+#include "wiringPi/wiringPi/wiringPi.h"
+#include "wiringPi/wiringPi/wiringPiI2C.h"
+#include "wiringPi/wiringPi/wiringPiSPI.h"
+#include "wiringPi/wiringPi/wiringSerial.h"
+#include "wiringPi/wiringPi/wiringShift.h"
+#include "wiringPi/wiringPi/drcSerial.h"
+#include "wiringPi/wiringPi/ads1115.h"
+#include "wiringPi/wiringPi/max31855.h"
+#include "wiringPi/wiringPi/max5322.h"
+#include "wiringPi/wiringPi/mcp23008.h"
+#include "wiringPi/wiringPi/mcp23016.h"
+#include "wiringPi/wiringPi/mcp23016reg.h"
+#include "wiringPi/wiringPi/mcp23017.h"
+#include "wiringPi/wiringPi/mcp23s08.h"
+#include "wiringPi/wiringPi/mcp23s17.h"
+#include "wiringPi/wiringPi/mcp23x0817.h"
+#include "wiringPi/wiringPi/mcp23x08.h"
+#include "wiringPi/wiringPi/mcp3002.h"
+#include "wiringPi/wiringPi/mcp3004.h"
+#include "wiringPi/wiringPi/mcp3422.h"
+#include "wiringPi/wiringPi/mcp4802.h"
+#include "wiringPi/wiringPi/pcf8574.h"
+#include "wiringPi/wiringPi/pcf8591.h"
+#include "wiringPi/wiringPi/sn3218.h"
+#include "wiringPi/wiringPi/softPwm.h"
+#include "wiringPi/wiringPi/softServo.h"
+#include "wiringPi/wiringPi/softTone.h"
+#include "wiringPi/wiringPi/sr595.h"
+#include "wiringPi/wiringPi/bmp180.h"
+#include "wiringPi/wiringPi/drcNet.h"
+#include "wiringPi/wiringPi/ds18b20.h"
+#include "wiringPi/wiringPi/htu21d.h"
+#include "wiringPi/wiringPi/pseudoPins.h"
+#include "wiringPi/wiringPi/rht03.h"
+#include "wiringPi/wiringPi/wpiExtensions.h"
+#include "wiringPi/devLib/ds1302.h"
+#include "wiringPi/devLib/font.h"
+#include "wiringPi/devLib/gertboard.h"
+#include "wiringPi/devLib/lcd128x64.h"
+#include "wiringPi/devLib/lcd.h"
+#include "wiringPi/devLib/maxdetect.h"
+#include "wiringPi/devLib/piGlow.h"
+#include "wiringPi/devLib/piNes.h"
+#include "wiringPi/devLib/scrollPhat.h"
+#include "wiringPi/devLib/piFace.h"
 %}
 
 %apply unsigned char { uint8_t };