diff --git a/api/mraa/common.h b/api/mraa/common.h
index 3dfcca7..54f3fbf 100644
--- a/api/mraa/common.h
+++ b/api/mraa/common.h
@@ -27,6 +27,7 @@
 #include "types.h"
 
 #define MRAA_PLATFORM_NAME_MAX_SIZE 64
+#define MRAA_PIN_NAME_SIZE 12
 
 /** @file
  *
diff --git a/examples/gpio.c b/examples/gpio.c
index d2044dc..5451578 100644
--- a/examples/gpio.c
+++ b/examples/gpio.c
@@ -70,7 +70,7 @@ list_pins()
     for (i = 0; i < pin_count; ++i) {
         if (strcmp(mraa_get_pin_name(i), "INVALID") != 0) {
             fprintf(stdout, "%02d ", i);
-            fprintf(stdout, "%8s: ", mraa_get_pin_name(i));
+            fprintf(stdout, "%*s: ", (MRAA_PIN_NAME_SIZE - 1), mraa_get_pin_name(i));
             if (mraa_pin_mode_test(i, MRAA_PIN_GPIO))
                 fprintf(stdout, "GPIO ");
             if (mraa_pin_mode_test(i, MRAA_PIN_I2C))
diff --git a/include/mraa_internal_types.h b/include/mraa_internal_types.h
index 30db65d..41ed831 100644
--- a/include/mraa_internal_types.h
+++ b/include/mraa_internal_types.h
@@ -155,7 +155,7 @@ typedef struct {
  */
 typedef struct {
     /*@{*/
-    char name[12];                      /**< Pin's real world name */
+    char name[MRAA_PIN_NAME_SIZE]; /**< Pin's real world name */
     mraa_pincapabilities_t capabilites; /**< Pin Capabiliites */
     mraa_pin_t gpio; /**< GPIO structure */
     mraa_pin_t pwm;  /**< PWM structure */