diff --git a/CMakeLists.txt b/CMakeLists.txt
index 13a8bc43..de5f60ab 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -86,8 +86,9 @@ function(rust_cargo_application)
   endif()
   set(BUILD_LIB_DIR "${CMAKE_CURRENT_SOURCE_DIR}/${RUST_TARGET}/${RUST_BUILD_TYPE}")
 
+  set(RUST_LIBRARY_NAME "${CMAKE_PROJECT_NAME}")
   set(CARGO_TARGET_DIR "${CMAKE_CURRENT_BINARY_DIR}/rust/target")
-  set(RUST_LIBRARY "${CARGO_TARGET_DIR}/${RUST_TARGET}/${RUST_BUILD_TYPE}/librustapp.a")
+  set(RUST_LIBRARY "${CARGO_TARGET_DIR}/${RUST_TARGET}/${RUST_BUILD_TYPE}/lib${RUST_LIBRARY_NAME}.a")
   set(SAMPLE_CARGO_CONFIG "${CMAKE_CURRENT_BINARY_DIR}/rust/sample-cargo-config.toml")
 
   # The generated C binding wrappers. These are bindgen-generated wrappers for the inline functions
diff --git a/samples/hello_world/CMakeLists.txt b/samples/hello_world/CMakeLists.txt
index 3030520d..b25069a0 100644
--- a/samples/hello_world/CMakeLists.txt
+++ b/samples/hello_world/CMakeLists.txt
@@ -4,5 +4,5 @@ cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
 
-project(hello_rust_world)
+project(hello_world)
 rust_cargo_application()
diff --git a/samples/hello_world/Cargo.toml b/samples/hello_world/Cargo.toml
index 09c1eada..81287e49 100644
--- a/samples/hello_world/Cargo.toml
+++ b/samples/hello_world/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 # This must be rustapp for now.
-name = "rustapp"
+name = "hello_world"
 version = "3.7.0"
 edition = "2021"
 description = "A sample hello world application in Rust"
diff --git a/samples/hello_world/sample.yaml b/samples/hello_world/sample.yaml
index 470bf10d..f71828b6 100644
--- a/samples/hello_world/sample.yaml
+++ b/samples/hello_world/sample.yaml
@@ -1,6 +1,6 @@
 sample:
   description: Hello world, but in Rust
-  name: hello rust world
+  name: hello world
 common:
   harness: console
   harness_config:
diff --git a/samples/philosophers/Cargo.toml b/samples/philosophers/Cargo.toml
index bb0cdf30..4be06809 100644
--- a/samples/philosophers/Cargo.toml
+++ b/samples/philosophers/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 # This must be rustapp for now.
-name = "rustapp"
+name = "philosophers"
 version = "3.7.0"
 edition = "2021"
 description = "A sample hello world application in Rust"
diff --git a/tests/time/CMakeLists.txt b/tests/time/CMakeLists.txt
index ae269f27..03d36bc1 100644
--- a/tests/time/CMakeLists.txt
+++ b/tests/time/CMakeLists.txt
@@ -3,7 +3,7 @@
 cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(time_rust)
+project(time)
 
 target_sources(app PRIVATE src/times.c)
 
diff --git a/tests/time/Cargo.toml b/tests/time/Cargo.toml
index ffcba92b..bfbcb801 100644
--- a/tests/time/Cargo.toml
+++ b/tests/time/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 # This must be rustapp for now.
-name = "rustapp"
+name = "time"
 version = "3.7.0"
 edition = "2021"
 description = "Tests of time"
diff --git a/tests/timer/CMakeLists.txt b/tests/timer/CMakeLists.txt
index 0f240c95..aaf6f2fe 100644
--- a/tests/timer/CMakeLists.txt
+++ b/tests/timer/CMakeLists.txt
@@ -3,6 +3,6 @@
 cmake_minimum_required(VERSION 3.20.0)
 
 find_package(Zephyr REQUIRED HINTS $ENV{ZEPHYR_BASE})
-project(timer_rust)
+project(timer)
 
 rust_cargo_application()
diff --git a/tests/timer/Cargo.toml b/tests/timer/Cargo.toml
index 52edcd20..44dbd9f2 100644
--- a/tests/timer/Cargo.toml
+++ b/tests/timer/Cargo.toml
@@ -3,7 +3,7 @@
 
 [package]
 # This must be rustapp for now.
-name = "rustapp"
+name = "timer"
 version = "3.7.0"
 edition = "2021"
 description = "Tests of timeers"