diff --git a/gpiozero/pins/pigpiod.py b/gpiozero/pins/pigpio.py
similarity index 99%
rename from gpiozero/pins/pigpiod.py
rename to gpiozero/pins/pigpio.py
index c6841be..fe5e59e 100644
--- a/gpiozero/pins/pigpiod.py
+++ b/gpiozero/pins/pigpio.py
@@ -45,9 +45,9 @@ class PiGPIOFactory(PiFactory):
     * Your script itself doesn't require root privileges; it just needs to
       be able to communicate with the daemon
 
-    You can construct pigpiod pins manually like so::
+    You can construct pigpio pins manually like so::
 
-        from gpiozero.pins.pigpiod import PiGPIOPin
+        from gpiozero.pins.pigpio import PiGPIOPin
         from gpiozero import LED
 
         led = LED(PiGPIOPin(12))
@@ -56,7 +56,7 @@ class PiGPIOFactory(PiFactory):
     accomplish this simply specify the host (and optionally port) when
     constructing the pin::
 
-        from gpiozero.pins.pigpiod import PiGPIOPin
+        from gpiozero.pins.pigpio import PiGPIOPin
         from gpiozero import LED
         from signal import pause
 
diff --git a/setup.py b/setup.py
index f1f76f8..7bafc6a 100644
--- a/setup.py
+++ b/setup.py
@@ -68,13 +68,13 @@ if sys.version_info[:2] == (3, 2):
 
 __entry_points__ = {
     'gpiozero_pin_factories': [
-        'pigpio  = gpiozero.pins.pigpiod:PiGPIOFactory',
+        'pigpio  = gpiozero.pins.pigpio:PiGPIOFactory',
         'rpigpio = gpiozero.pins.rpigpio:RPiGPIOFactory',
         'rpio    = gpiozero.pins.rpio:RPIOFactory',
         'native  = gpiozero.pins.native:NativeFactory',
         'mock    = gpiozero.pins.mock:MockFactory',
         # Backwards compatible names
-        'PiGPIOPin  = gpiozero.pins.pigpiod:PiGPIOFactory',
+        'PiGPIOPin  = gpiozero.pins.pigpio:PiGPIOFactory',
         'RPiGPIOPin = gpiozero.pins.rpigpio:RPiGPIOFactory',
         'RPIOPin    = gpiozero.pins.rpio:RPIOFactory',
         'NativePin  = gpiozero.pins.native:NativeFactory',