diff --git a/README.md b/README.md
index acb5f5d..5093086 100644
--- a/README.md
+++ b/README.md
@@ -107,8 +107,8 @@ The BMI088 accelerometer features two interrupt pins that the data ready interru
 
 | Pin Mode   | Name       |
 | ---------- | ---------- |
-| Push-Pull  | PUSH_PULL  |
-| Open-Drain | OPEN_DRAIN |
+| Push-Pull  | PM_PUSH_PULL  |
+| Open-Drain | PM_OPEN_DRAIN |
 
 | Active Level | Name        |
 | ------------ | ----------- |
@@ -119,7 +119,7 @@ Below is an example of setting the interrupt pin 1 to push-pull and active-high.
 
 ```C++
 bool status;
-status = accel.pinModeInt1(Bmi088Accel::PUSH_PULL,Bmi088Accel::ACTIVE_HIGH);
+status = accel.pinModeInt1(Bmi088Accel::PM_PUSH_PULL,Bmi088Accel::ACTIVE_HIGH);
 ```
 
 **(optional) mapDrdyInt1(bool enable)**
@@ -253,8 +253,8 @@ The BMI088 gyro features two interrupt pins that the data ready interrupt can be
 
 | Pin Mode   | Name       |
 | ---------- | ---------- |
-| Push-Pull  | PUSH_PULL  |
-| Open-Drain | OPEN_DRAIN |
+| Push-Pull  | PM_PUSH_PULL  |
+| Open-Drain | PM_OPEN_DRAIN |
 
 | Active Level | Name        |
 | ------------ | ----------- |
@@ -265,7 +265,7 @@ Below is an example of setting the interrupt pin 3 to push-pull and active-high.
 
 ```C++
 bool status;
-status = gyro.pinModeInt3(Bmi088Gyro::PUSH_PULL,Bmi088Gyro::ACTIVE_HIGH);
+status = gyro.pinModeInt3(Bmi088Gyro::PM_PUSH_PULL,Bmi088Gyro::ACTIVE_HIGH);
 ```
 
 **(optional) mapDrdyInt3(bool enable)**
@@ -416,8 +416,8 @@ The BMI088 synchronized data interrupt pin can be setup with respect to whether
 
 | Pin Mode   | Name       |
 | ---------- | ---------- |
-| Push-Pull  | PUSH_PULL  |
-| Open-Drain | OPEN_DRAIN |
+| Push-Pull  | PM_PUSH_PULL  |
+| Open-Drain | PM_OPEN_DRAIN |
 
 | Active Level | Name        |
 | ------------ | ----------- |
@@ -428,7 +428,7 @@ Below is an example of setting the interrupt to push-pull and active-high.
 
 ```C++
 bool status;
-status = bmi.pinModeDrdy(Bmi088::PUSH_PULL,Bmi088::ACTIVE_HIGH);
+status = bmi.pinModeDrdy(Bmi088::PM_PUSH_PULL,Bmi088::ACTIVE_HIGH);
 ```
 
 ### Common Data Collection Functions
diff --git a/src/BMI088.cpp b/src/BMI088.cpp
index c6ca973..fa94b5d 100644
--- a/src/BMI088.cpp
+++ b/src/BMI088.cpp
@@ -938,11 +938,11 @@ bool Bmi088Accel::pinModeInt1(PinIO io, PinMode mode, PinLevel level)
     }
   }
   switch (mode) {
-    case PUSH_PULL: {
+    case PM_PUSH_PULL: {
       pin_mode = ACC_INT_PUSHPULL;
       break;
     }
-    case OPEN_DRAIN: {
+    case PM_OPEN_DRAIN: {
       pin_mode = ACC_INT_OPENDRAIN;
       break;
     }
@@ -993,11 +993,11 @@ bool Bmi088Accel::pinModeInt2(PinIO io, PinMode mode, PinLevel level)
     }
   }
   switch (mode) {
-    case PUSH_PULL: {
+    case PM_PUSH_PULL: {
       pin_mode = ACC_INT_PUSHPULL;
       break;
     }
-    case OPEN_DRAIN: {
+    case PM_OPEN_DRAIN: {
       pin_mode = ACC_INT_OPENDRAIN;
       break;
     }
@@ -1309,11 +1309,11 @@ bool Bmi088Gyro::pinModeInt3(PinMode mode, PinLevel level)
   uint8_t pin_mode, active_lvl;
   readRegisters(GYRO_INT3_IO_CTRL_ADDR,1,&readReg);
   switch (mode) {
-    case PUSH_PULL: {
+    case PM_PUSH_PULL: {
       pin_mode = GYRO_INT_PUSHPULL;
       break;
     }
-    case OPEN_DRAIN: {
+    case PM_OPEN_DRAIN: {
       pin_mode = GYRO_INT_OPENDRAIN;
       break;
     }
@@ -1350,11 +1350,11 @@ bool Bmi088Gyro::pinModeInt4(PinMode mode, PinLevel level)
   uint8_t pin_mode, active_lvl;
   readRegisters(GYRO_INT4_IO_CTRL_ADDR,1,&readReg);
   switch (mode) {
-    case PUSH_PULL: {
+    case PM_PUSH_PULL: {
       pin_mode = GYRO_INT_PUSHPULL;
       break;
     }
-    case OPEN_DRAIN: {
+    case PM_OPEN_DRAIN: {
       pin_mode = GYRO_INT_OPENDRAIN;
       break;
     }
@@ -1566,7 +1566,7 @@ int Bmi088::begin()
     return -5000;
   }
   // set default drdy pin settings
-  if (!pinModeDrdy(PUSH_PULL,ACTIVE_HIGH)) {
+  if (!pinModeDrdy(PM_PUSH_PULL,ACTIVE_HIGH)) {
     return -6000;
   } 
   return 1;
@@ -1636,7 +1636,7 @@ bool Bmi088::mapDrdy(DrdyPin pin)
 {
   switch (pin) {
     case PIN_1: {
-      if(!accel->pinModeInt2(Bmi088Accel::PIN_INPUT,Bmi088Accel::PUSH_PULL,Bmi088Accel::ACTIVE_HIGH)) {
+      if(!accel->pinModeInt2(Bmi088Accel::PIN_INPUT,Bmi088Accel::PM_PUSH_PULL,Bmi088Accel::ACTIVE_HIGH)) {
         return false;
       }
       accel->writeRegister(ACC_INT1_MAP_ADDR,ACC_INTA_ENABLE);
@@ -1644,7 +1644,7 @@ bool Bmi088::mapDrdy(DrdyPin pin)
       return true;
     }
     case PIN_2: {
-      if(!accel->pinModeInt1(Bmi088Accel::PIN_INPUT,Bmi088Accel::PUSH_PULL,Bmi088Accel::ACTIVE_HIGH)) {
+      if(!accel->pinModeInt1(Bmi088Accel::PIN_INPUT,Bmi088Accel::PM_PUSH_PULL,Bmi088Accel::ACTIVE_HIGH)) {
         return false;
       }
       accel->writeRegister(ACC_INT2_MAP_ADDR,ACC_INTA_ENABLE);
@@ -1652,7 +1652,7 @@ bool Bmi088::mapDrdy(DrdyPin pin)
       return true;
     }
     default: {
-      if(!accel->pinModeInt1(Bmi088Accel::PIN_INPUT,Bmi088Accel::PUSH_PULL,Bmi088Accel::ACTIVE_HIGH)) {
+      if(!accel->pinModeInt1(Bmi088Accel::PIN_INPUT,Bmi088Accel::PM_PUSH_PULL,Bmi088Accel::ACTIVE_HIGH)) {
         return false;
       }
       accel->writeRegister(ACC_INT2_MAP_ADDR,ACC_INTA_ENABLE);
@@ -1690,7 +1690,7 @@ bool Bmi088::mapSync(SyncPin pin)
 {
   switch (pin) {
     case PIN_3: {
-      if (!gyro->pinModeInt3(Bmi088Gyro::PUSH_PULL,Bmi088Gyro::ACTIVE_HIGH)) {
+      if (!gyro->pinModeInt3(Bmi088Gyro::PM_PUSH_PULL,Bmi088Gyro::ACTIVE_HIGH)) {
         return false;
       }
       if (!gyro->mapDrdyInt3(true)) {
@@ -1699,7 +1699,7 @@ bool Bmi088::mapSync(SyncPin pin)
       return true;
     }
     case PIN_4: {
-      if (!gyro->pinModeInt4(Bmi088Gyro::PUSH_PULL,Bmi088Gyro::ACTIVE_HIGH)) {
+      if (!gyro->pinModeInt4(Bmi088Gyro::PM_PUSH_PULL,Bmi088Gyro::ACTIVE_HIGH)) {
         return false;
       }
       if (!gyro->mapDrdyInt4(true)) {
@@ -1708,7 +1708,7 @@ bool Bmi088::mapSync(SyncPin pin)
       return true;
     }
     default: {
-      if (!gyro->pinModeInt3(Bmi088Gyro::PUSH_PULL,Bmi088Gyro::ACTIVE_HIGH)) {
+      if (!gyro->pinModeInt3(Bmi088Gyro::PM_PUSH_PULL,Bmi088Gyro::ACTIVE_HIGH)) {
         return false;
       }
       if (!gyro->mapDrdyInt3(true)) {
diff --git a/src/BMI088.h b/src/BMI088.h
index a8909f7..d4ff112 100644
--- a/src/BMI088.h
+++ b/src/BMI088.h
@@ -63,8 +63,8 @@ class Bmi088Accel {
       ODR_12_5HZ_BW_1HZ
     };
     enum PinMode {
-      PUSH_PULL,
-      OPEN_DRAIN
+      PM_PUSH_PULL,
+      PM_OPEN_DRAIN
     };
     enum PinLevel {
       ACTIVE_HIGH,
@@ -224,8 +224,8 @@ class Bmi088Gyro {
       ODR_100HZ_BW_32HZ = 0x87
     };
     enum PinMode {
-      PUSH_PULL,
-      OPEN_DRAIN
+      PM_PUSH_PULL,
+      PM_OPEN_DRAIN
     };
     enum PinLevel {
       ACTIVE_HIGH,
@@ -359,8 +359,8 @@ class Bmi088 {
       PIN_4
     };
     enum PinMode {
-      PUSH_PULL,
-      OPEN_DRAIN
+      PM_PUSH_PULL,
+      PM_OPEN_DRAIN
     };
     enum PinLevel {
       ACTIVE_HIGH,