diff --git a/bbb.go b/bbb.go
index 4c82f85..ce349af 100644
--- a/bbb.go
+++ b/bbb.go
@@ -12,10 +12,10 @@ import (
 func init() {
 	Describers[HostBBB] = func(rev int) *Descriptor {
 		return &Descriptor{
-			GPIO: func() GPIO {
+			GPIODriver: func() GPIODriver {
 				return newGPIODriver(bbbPins, newDigitalPin, newBBBAnalogPin)
 			},
-			I2C: newI2CDriver,
+			I2CDriver: newI2CDriver,
 			LEDDriver: func() LEDDriver {
 				return newLEDDriver(bbbLEDMap)
 			},
diff --git a/descriptor.go b/descriptor.go
index fbbc5a7..ffd4a96 100644
--- a/descriptor.go
+++ b/descriptor.go
@@ -6,9 +6,9 @@ import (
 )
 
 type Descriptor struct {
-	GPIO      func() GPIO
-	I2C       func() I2C
-	LEDDriver func() LEDDriver
+	GPIODriver func() GPIODriver
+	I2CDriver  func() I2CDriver
+	LEDDriver  func() LEDDriver
 }
 
 type Describer func(rev int) *Descriptor
diff --git a/gpio.go b/gpio.go
index 8b13134..138cbf8 100644
--- a/gpio.go
+++ b/gpio.go
@@ -36,14 +36,14 @@ type AnalogPin interface {
 	Close() error
 }
 
-type GPIO interface {
+type GPIODriver interface {
 	DigitalPin(key interface{}) (DigitalPin, error)
 	AnalogPin(key interface{}) (AnalogPin, error)
 
 	Close() error
 }
 
-var gpioInstance GPIO
+var gpioDriverInstance GPIODriver
 
 func InitGPIO() error {
 	desc, err := DescribeHost()
@@ -51,21 +51,21 @@ func InitGPIO() error {
 		return err
 	}
 
-	if desc.GPIO == nil {
+	if desc.GPIODriver == nil {
 		return ErrFeatureNotSupport
 	}
 
-	gpioInstance = desc.GPIO()
+	gpioDriverInstance = desc.GPIODriver()
 
 	return nil
 }
 
 func CloseGPIO() error {
-	return gpioInstance.Close()
+	return gpioDriverInstance.Close()
 }
 
 func NewDigitalPin(key interface{}) (DigitalPin, error) {
-	return gpioInstance.DigitalPin(key)
+	return gpioDriverInstance.DigitalPin(key)
 }
 
 func DigitalWrite(key interface{}, val int) error {
@@ -105,7 +105,7 @@ func ActiveLow(key interface{}, b bool) error {
 }
 
 func NewAnalogPin(key interface{}) (AnalogPin, error) {
-	return gpioInstance.AnalogPin(key)
+	return gpioDriverInstance.AnalogPin(key)
 }
 
 func AnalogWrite(key interface{}, val int) error {
diff --git a/gpiodriver.go b/gpiodriver.go
index 1ed29db..4121a2b 100644
--- a/gpiodriver.go
+++ b/gpiodriver.go
@@ -18,7 +18,7 @@ type gpioDriver struct {
 	initializedPins map[string]pin
 }
 
-func newGPIODriver(pinMap PinMap, dpf func(n int) DigitalPin, apf func(n int) AnalogPin) GPIO {
+func newGPIODriver(pinMap PinMap, dpf func(n int) DigitalPin, apf func(n int) AnalogPin) GPIODriver {
 	return &gpioDriver{
 		pinMap: pinMap,
 		dpf:    dpf,
diff --git a/i2c.go b/i2c.go
index fa43702..29b8253 100644
--- a/i2c.go
+++ b/i2c.go
@@ -23,13 +23,13 @@ type I2CBus interface {
 	WriteWordToReg(addr, reg byte, value uint16) error
 }
 
-type I2C interface {
+type I2CDriver interface {
 	Bus(l byte) I2CBus
 
 	Close() error
 }
 
-var i2cInstance I2C
+var i2cDriverInstance I2CDriver
 
 func InitI2C() error {
 	desc, err := DescribeHost()
@@ -37,19 +37,19 @@ func InitI2C() error {
 		return err
 	}
 
-	if desc.I2C == nil {
+	if desc.I2CDriver == nil {
 		return ErrFeatureNotSupport
 	}
 
-	i2cInstance = desc.I2C()
+	i2cDriverInstance = desc.I2CDriver()
 
 	return nil
 }
 
 func CloseI2C() error {
-	return i2cInstance.Close()
+	return i2cDriverInstance.Close()
 }
 
 func NewI2CBus(l byte) I2CBus {
-	return i2cInstance.Bus(l)
+	return i2cDriverInstance.Bus(l)
 }
diff --git a/i2cdriver.go b/i2cdriver.go
index d9905ed..2995bbe 100644
--- a/i2cdriver.go
+++ b/i2cdriver.go
@@ -15,7 +15,7 @@ type i2cDriver struct {
 	busMapLock sync.Mutex
 }
 
-func newI2CDriver() I2C {
+func newI2CDriver() I2CDriver {
 	return &i2cDriver{
 		busMap: make(map[byte]*i2cBus),
 	}
diff --git a/rpi.go b/rpi.go
index ec83a41..7be216b 100644
--- a/rpi.go
+++ b/rpi.go
@@ -8,10 +8,10 @@ func init() {
 		}
 
 		return &Descriptor{
-			GPIO: func() GPIO {
+			GPIODriver: func() GPIODriver {
 				return newGPIODriver(pins, newDigitalPin, nil)
 			},
-			I2C: newI2CDriver,
+			I2CDriver: newI2CDriver,
 		}
 	}
 }