diff --git a/examples/blink_onboard.c b/examples/blink_onboard.c
index 272547d..730ea08 100644
--- a/examples/blink_onboard.c
+++ b/examples/blink_onboard.c
@@ -33,20 +33,14 @@ main(int argc, char **argv)
 {
     mraa_platform_t platform = mraa_get_platform_type();
     mraa_gpio_context gpio, gpio_in = NULL;
-    char board_name[] = "Some weird devboard that isn't recognised...";
+    char* board_name = mraa_get_platform_name();
     int ledstate = 0;
 
     switch (platform) {
         case MRAA_INTEL_GALILEO_GEN1:
-            strcpy(board_name, "Intel Galileo Gen1");
             gpio = mraa_gpio_init_raw(3);
             break;
-        case MRAA_INTEL_GALILEO_GEN2:
-            strcpy(board_name, "Intel Galileo Gen2");
-            gpio = mraa_gpio_init(13);
-            break;
         case MRAA_INTEL_MINNOWBOARD_MAX:
-            strcpy(board_name, "Intel Minnowboard Max");
             gpio = mraa_gpio_init(21);
             break;
         default:
@@ -62,6 +56,7 @@ main(int argc, char **argv)
         return 1;
     }
 
+    // on platforms with physical button use gpio_in
     if (platform == MRAA_INTEL_MINNOWBOARD_MAX) {
         gpio_in = mraa_gpio_init(14);
 	if (gpio_in != NULL) {
@@ -69,7 +64,9 @@ main(int argc, char **argv)
             fprintf(stdout, "Press and hold S1 to stop\n");
         }
     }
+
     mraa_gpio_dir(gpio, MRAA_GPIO_OUT);
+
     for (;;) {
         if (gpio_in != NULL && mraa_gpio_read(gpio_in) == 0) {
             return 0;
diff --git a/examples/gpio.c b/examples/gpio.c
index 1b9b088..a8cdcb7 100644
--- a/examples/gpio.c
+++ b/examples/gpio.c
@@ -59,12 +59,8 @@ list_pins() {
     for (i = 0; i < platformInfo->phy_pin_count; ++i) {
         const char *mraa_name = platformInfo->pins[i].name;
         if (strcmp(mraa_name, "INVALID") != 0) {
-            char name[9];
-            strncpy(name, mraa_name, 8);
-            if (name[7] != '\0');
-                name[8] = '\0';
             mraa_pincapabilities_t caps = platformInfo->pins[i].capabilites;
-            fprintf(stdout, "%02d %-8s  ", i, name);
+            fprintf(stdout, "%02d %-8s  ", i, mraa_name);
             if (caps.gpio)
                 fprintf(stdout, "GPIO");
             if (caps.i2c)
diff --git a/examples/hellomraa.c b/examples/hellomraa.c
index a8b2d39..5710fe1 100644
--- a/examples/hellomraa.c
+++ b/examples/hellomraa.c
@@ -31,37 +31,12 @@
 int
 main(int argc, char **argv)
 {
-    mraa_result_t ret;
-    char board_name[64];
-    mraa_platform_t platform = mraa_get_platform_type();
-    ret = mraa_set_log_level(LOG_DEBUG);
-
-    switch (platform) {
-        case MRAA_INTEL_GALILEO_GEN1:
-            strcpy(board_name, "Intel Galileo Gen1");
-            break;
-        case MRAA_INTEL_GALILEO_GEN2:
-            strcpy(board_name, "Intel Galileo Gen2");
-            break;
-        case MRAA_INTEL_EDISON_FAB_C:
-            strcpy(board_name, "Edison Fab C");
-            break;
-        case MRAA_INTEL_DE3815:
-            strcpy(board_name, "Intel DE3815");
-            break;
-        case MRAA_INTEL_MINNOWBOARD_MAX:
-            strcpy(board_name, "Intel Minnowboard Max");
-            break;
-        default:
-            strcpy(board_name, "Unknown board");
-    }
-
+    char* board_name = mraa_get_platform_name();
 
     fprintf(stdout, "hello mraa\n Version: %s\n Running on %s\n", mraa_get_version(), board_name);
 
-
     mraa_deinit();
 
-    return ret;
+    return MRAA_SUCCESS;
 }
 //! [Interesting]