diff --git a/platforms/raspi/raspi_adaptor.go b/platforms/raspi/raspi_adaptor.go
index 295cc31b..51f9a031 100644
--- a/platforms/raspi/raspi_adaptor.go
+++ b/platforms/raspi/raspi_adaptor.go
@@ -31,7 +31,7 @@ type Adaptor struct {
 // NewAdaptor creates a Raspi Adaptor
 func NewAdaptor() *Adaptor {
 	r := &Adaptor{
-		name:        "RaspberryPi",
+		name:        gobot.DefaultName("RaspberryPi"),
 		digitalPins: make(map[int]sysfs.DigitalPin),
 		pwmPins:     []int{},
 	}
diff --git a/platforms/raspi/raspi_adaptor_test.go b/platforms/raspi/raspi_adaptor_test.go
index 5f520773..15c11328 100644
--- a/platforms/raspi/raspi_adaptor_test.go
+++ b/platforms/raspi/raspi_adaptor_test.go
@@ -30,6 +30,13 @@ Serial          : 000000003bc748ea
 	return a
 }
 
+func TestRaspiAdaptorName(t *testing.T) {
+	a := initTestAdaptor()
+	gobottest.Assert(t, strings.HasPrefix(a.Name(), "RaspberryPi"), true)
+	a.SetName("NewName")
+	gobottest.Assert(t, a.Name(), "NewName")
+}
+
 func TestAdaptor(t *testing.T) {
 	readFile = func() ([]byte, error) {
 		return []byte(`
@@ -39,7 +46,7 @@ Serial          : 000000003bc748ea
 `), nil
 	}
 	a := NewAdaptor()
-	gobottest.Assert(t, a.Name(), "RaspberryPi")
+	gobottest.Assert(t, strings.HasPrefix(a.Name(), "RaspberryPi"), true)
 	gobottest.Assert(t, a.i2cDefaultBus, 1)
 	gobottest.Assert(t, a.revision, "3")