diff --git a/apps/drivers/device/cdev.cpp b/apps/drivers/device/cdev.cpp
index d07d26e824f..422321850a7 100644
--- a/apps/drivers/device/cdev.cpp
+++ b/apps/drivers/device/cdev.cpp
@@ -32,7 +32,9 @@
  ****************************************************************************/
 
 /**
- * @file Character device base class.
+ * @file cdev.cpp
+ *
+ * Character device base class.
  */
 
 #include "device.h"
diff --git a/apps/drivers/device/device.cpp b/apps/drivers/device/device.cpp
index c14a3234da4..04a5222c361 100644
--- a/apps/drivers/device/device.cpp
+++ b/apps/drivers/device/device.cpp
@@ -32,7 +32,9 @@
  ****************************************************************************/
 
 /**
- * @file Fundamental driver base class for the device framework.
+ * @file device.cpp
+ *
+ * Fundamental driver base class for the device framework.
  */
 
 #include "device.h"
diff --git a/apps/drivers/device/device.h b/apps/drivers/device/device.h
index 01692c3154c..7d375aab918 100644
--- a/apps/drivers/device/device.h
+++ b/apps/drivers/device/device.h
@@ -32,7 +32,9 @@
  ****************************************************************************/
 
 /**
- * @file Definitions for the generic base classes in the device framework.
+ * @file device.h
+ *
+ * Definitions for the generic base classes in the device framework.
  */
 
 #ifndef _DEVICE_DEVICE_H
diff --git a/apps/drivers/device/i2c.cpp b/apps/drivers/device/i2c.cpp
index 4b832b5485c..56112d76772 100644
--- a/apps/drivers/device/i2c.cpp
+++ b/apps/drivers/device/i2c.cpp
@@ -32,7 +32,9 @@
  ****************************************************************************/
 
 /**
- * @file Base class for devices attached via the I2C bus.
+ * @file i2c.cpp
+ *
+ * Base class for devices attached via the I2C bus.
  *
  * @todo Bus frequency changes; currently we do nothing with the value
  *       that is supplied.  Should we just depend on the bus knowing?
diff --git a/apps/drivers/device/i2c.h b/apps/drivers/device/i2c.h
index eb1b6cb053c..3112e8e376b 100644
--- a/apps/drivers/device/i2c.h
+++ b/apps/drivers/device/i2c.h
@@ -32,7 +32,9 @@
  ****************************************************************************/
 
 /**
- * @file Base class for devices connected via I2C.
+ * @file i2c.h
+ *
+ * Base class for devices connected via I2C.
  */
 
 #ifndef _DEVICE_I2C_H
diff --git a/apps/drivers/device/pio.cpp b/apps/drivers/device/pio.cpp
index 5179752b553..f3a805a5e61 100644
--- a/apps/drivers/device/pio.cpp
+++ b/apps/drivers/device/pio.cpp
@@ -32,7 +32,9 @@
  ****************************************************************************/
 
 /**
- * @file Base class for devices accessed via PIO to registers.
+ * @file pio.cpp
+ *
+ * Base class for devices accessed via PIO to registers.
  */
 
 #include "device.h"
diff --git a/apps/drivers/device/spi.cpp b/apps/drivers/device/spi.cpp
index 528333e0419..63c7c12aa1c 100644
--- a/apps/drivers/device/spi.cpp
+++ b/apps/drivers/device/spi.cpp
@@ -32,7 +32,9 @@
  ****************************************************************************/
 
 /**
- * @file Base class for devices connected via SPI.
+ * @file spi.cpp
+ *
+ * Base class for devices connected via SPI.
  *
  * @todo Work out if caching the mode/frequency would save any time.
  *
diff --git a/apps/drivers/device/spi.h b/apps/drivers/device/spi.h
index e8c8e2c5e2b..d2d01efb352 100644
--- a/apps/drivers/device/spi.h
+++ b/apps/drivers/device/spi.h
@@ -32,7 +32,9 @@
  ****************************************************************************/
 
 /**
- * @file Base class for devices connected via SPI.
+ * @file spi.h
+ *
+ * Base class for devices connected via SPI.
  */
 
 #ifndef _DEVICE_SPI_H
diff --git a/apps/drivers/drv_gpio.h b/apps/drivers/drv_gpio.h
index 5b86dd920d2..b8d1fa0f0ae 100644
--- a/apps/drivers/drv_gpio.h
+++ b/apps/drivers/drv_gpio.h
@@ -32,7 +32,9 @@
  ****************************************************************************/
 
 /**
- * @file	Generic GPIO ioctl interface.
+ * @file drv_gpio.h
+ *
+ * Generic GPIO ioctl interface.
  */
 
 #ifndef _DRV_GPIO_H
@@ -78,7 +80,7 @@
  * Note that there may be board-specific relationships between GPIOs;
  * applications using GPIOs should be aware of this.
  */
-#define _GPIOCBASE	0x6700
+#define _GPIOCBASE	0x2700
 #define GPIOC(_x)	_IOC(_GPIOCBASE, _x)
 
 /** reset all board GPIOs to their default state */