diff --git a/examples/IRReceiver/IRReceiver.ino b/examples/IRReceiver/IRReceiver.ino
index f4dcee225d74cc8adb8ff9343ac6e412205aff5c..514c16e37b73b15ab994153cfceb73396c11416a 100644
--- a/examples/IRReceiver/IRReceiver.ino
+++ b/examples/IRReceiver/IRReceiver.ino
@@ -1,7 +1,7 @@
-#include "bits_ir_receiver.h"
+#include "ir_receiver.h"
 
 #define IR_PIN 46
-BitsIrReceiver ir_sensor(IR_PIN);
+IrReceiver ir_sensor(IR_PIN);
 int command;
 
 void setup(){
diff --git a/bits_ir_receiver.cpp b/ir_receiver.cpp
similarity index 78%
rename from bits_ir_receiver.cpp
rename to ir_receiver.cpp
index b3343012b76a33935a3ef60d85ca249879e50c6a..63a1f6813fd7d5d78fa8e030fc29b8649e6a5cf6 100644
--- a/bits_ir_receiver.cpp
+++ b/ir_receiver.cpp
@@ -1,7 +1,7 @@
 #include "bits_ir_receiver.h"
 
-BitsIrReceiver::BitsIrReceiver(int pin) {
-    IRrecv ir_receiver(aPin);
+BitsIrReceiver::BitsIrReceiver(uint8_t data_pin) {
+    IRrecv ir_receiver(data_pin);
 }
 
 void BitsIrReceiver::begin() {
diff --git a/bits_ir_receiver.h b/ir_receiver.h
similarity index 92%
rename from bits_ir_receiver.h
rename to ir_receiver.h
index 829ca9c016cde9baa816cb381adc987c372f4289..c07f209b5f1373c672fe3ba816e4fa1bd05b0a99 100644
--- a/bits_ir_receiver.h
+++ b/ir_receiver.h
@@ -1,5 +1,5 @@
-#ifndef BITS_IR_RECEIVER_H
-#define BITS_IR_RECEIVER_H
+#ifndef IR_RECEIVER_H
+#define IR_RECEIVER_H
 
 /* ****************************************** *
  * IR Remote                                  *
@@ -31,10 +31,10 @@
 #define IR_USE_AVR_TIMER3
 #include <IRremote.h>
 
-class BitsIrReceiver
+class IrReceiver
 {
 public:
-    BitsIrReceiver(uint8_t pin);
+    IrReceiver(uint8_t data_pin);
     void begin();
     uint8_t receive_command();