diff --git a/examples/ipso-objects/Makefile b/examples/lwm2m-ipso-objects/Makefile
similarity index 100%
rename from examples/ipso-objects/Makefile
rename to examples/lwm2m-ipso-objects/Makefile
diff --git a/examples/ipso-objects/README.md b/examples/lwm2m-ipso-objects/README.md
similarity index 100%
rename from examples/ipso-objects/README.md
rename to examples/lwm2m-ipso-objects/README.md
diff --git a/examples/ipso-objects/example-ipso-objects.c b/examples/lwm2m-ipso-objects/example-ipso-objects.c
similarity index 100%
rename from examples/ipso-objects/example-ipso-objects.c
rename to examples/lwm2m-ipso-objects/example-ipso-objects.c
diff --git a/examples/ipso-objects/example-ipso-temperature.c b/examples/lwm2m-ipso-objects/example-ipso-temperature.c
similarity index 100%
rename from examples/ipso-objects/example-ipso-temperature.c
rename to examples/lwm2m-ipso-objects/example-ipso-temperature.c
diff --git a/examples/ipso-objects/example-server.c b/examples/lwm2m-ipso-objects/example-server.c
similarity index 100%
rename from examples/ipso-objects/example-server.c
rename to examples/lwm2m-ipso-objects/example-server.c
diff --git a/examples/ipso-objects/project-conf.h b/examples/lwm2m-ipso-objects/project-conf.h
similarity index 100%
rename from examples/ipso-objects/project-conf.h
rename to examples/lwm2m-ipso-objects/project-conf.h
diff --git a/examples/ipso-objects/serial-protocol.c b/examples/lwm2m-ipso-objects/serial-protocol.c
similarity index 100%
rename from examples/ipso-objects/serial-protocol.c
rename to examples/lwm2m-ipso-objects/serial-protocol.c
diff --git a/examples/ipso-objects/serial-protocol.h b/examples/lwm2m-ipso-objects/serial-protocol.h
similarity index 100%
rename from examples/ipso-objects/serial-protocol.h
rename to examples/lwm2m-ipso-objects/serial-protocol.h
diff --git a/tests/01-compile-base/Makefile b/tests/01-compile-base/Makefile
index 0c7e248e0..cb20757c7 100644
--- a/tests/01-compile-base/Makefile
+++ b/tests/01-compile-base/Makefile
@@ -14,8 +14,8 @@ libs/energest/sky \
 libs/data-structures/native \
 libs/data-structures/sky \
 libs/stack-check/sky \
-ipso-objects/native \
-ipso-objects/native:MAKE_WITH_DTLS=1 \
+lwm2m-ipso-objects/native \
+lwm2m-ipso-objects/native:MAKE_WITH_DTLS=1 \
 rpl-udp/sky \
 rpl-border-router/native \
 rpl-border-router/sky \
diff --git a/tests/02-compile-arm-ports-01/Makefile b/tests/02-compile-arm-ports-01/Makefile
index 51b232173..1ecf59fe4 100644
--- a/tests/02-compile-arm-ports-01/Makefile
+++ b/tests/02-compile-arm-ports-01/Makefile
@@ -40,7 +40,7 @@ sensniff/cc2538dk \
 rpl-udp/cc2538dk \
 coap/cc2538dk \
 slip-radio/cc2538dk \
-ipso-objects/cc2538dk \
+lwm2m-ipso-objects/cc2538dk \
 multicast/cc2538dk \
 dev/gpio-hal/cc2538dk \
 dev/leds/cc2538dk \
diff --git a/tests/03-compile-arm-ports-02/Makefile b/tests/03-compile-arm-ports-02/Makefile
index a69ec44a0..18b052f14 100644
--- a/tests/03-compile-arm-ports-02/Makefile
+++ b/tests/03-compile-arm-ports-02/Makefile
@@ -14,8 +14,8 @@ platform-specific/zoul/rtcc/zoul \
 platform-specific/zoul/zoul \
 coap/zoul \
 multicast/zoul \
-ipso-objects/zoul \
-ipso-objects/zoul:MAKE_WITH_DTLS=1 \
+lwm2m-ipso-objects/zoul \
+lwm2m-ipso-objects/zoul:MAKE_WITH_DTLS=1 \
 hello-world/zoul \
 sensniff/zoul \
 sensniff/zoul:ZOUL_CONF_SUB_GHZ_SNIFFER=1 \
diff --git a/tests/18-coap-lwm2m/06-lwm2m-ipso-test.sh b/tests/18-coap-lwm2m/06-lwm2m-ipso-test.sh
index 7684044a8..9aacc2976 100755
--- a/tests/18-coap-lwm2m/06-lwm2m-ipso-test.sh
+++ b/tests/18-coap-lwm2m/06-lwm2m-ipso-test.sh
@@ -9,9 +9,9 @@ IPADDR=fd00::302:304:506:708
 
 # Starting Contiki-NG native node
 echo "Starting native node - lwm2m/ipso objects"
-make -C $CONTIKI/examples/ipso-objects clean >/dev/null
-make -C $CONTIKI/examples/ipso-objects > make.log 2> make.err
-sudo $CONTIKI/examples/ipso-objects/example-ipso-objects.native > node.log 2> node.err &
+make -C $CONTIKI/examples/lwm2m-ipso-objects clean >/dev/null
+make -C $CONTIKI/examples/lwm2m-ipso-objects > make.log 2> make.err
+sudo $CONTIKI/examples/lwm2m-ipso-objects/example-ipso-objects.native > node.log 2> node.err &
 CPID=$!
 sleep 10