4 files changed, 6 insertions, 6 deletions
diff --git a/test/camera/capture.cpp b/test/camera/capture.cpp
index bc3a4d6c..e7e64382 100644
--- a/test/camera/capture.cpp
+++ b/test/camera/capture.cpp
@@ -43,7 +43,7 @@ protected:
 	int run()
 	{
 		CameraConfiguration config =
-			camera_->generateConfiguration({ Stream::VideoRecording() });
+			camera_->generateConfiguration({ StreamRole::VideoRecording });
 		Stream *stream = config.front();
 		StreamConfiguration *cfg = &config[stream];
 
diff --git a/test/camera/configuration_default.cpp b/test/camera/configuration_default.cpp
index 340b5f58..8c4a03db 100644
--- a/test/camera/configuration_default.cpp
+++ b/test/camera/configuration_default.cpp
@@ -21,7 +21,7 @@ protected:
 		CameraConfiguration config;
 
 		/* Test asking for configuration for a video stream. */
-		config = camera_->generateConfiguration({ Stream::VideoRecording() });
+		config = camera_->generateConfiguration({ StreamRole::VideoRecording });
 		if (!config.isValid()) {
 			cout << "Default configuration invalid" << endl;
 			return TestFail;
@@ -29,11 +29,11 @@ protected:
 
 		/*
 		 * Test that asking for configuration for an empty array of
-		 * stream usages returns an empty list of configurations.
+		 * stream roles returns an empty list of configurations.
 		 */
 		config = camera_->generateConfiguration({});
 		if (config.isValid()) {
-			cout << "Failed to retrieve configuration for empty usage list"
+			cout << "Failed to retrieve configuration for empty roles list"
 			     << endl;
 			return TestFail;
 		}
diff --git a/test/camera/configuration_set.cpp b/test/camera/configuration_set.cpp
index 24d5ca66..76d8bc3e 100644
--- a/test/camera/configuration_set.cpp
+++ b/test/camera/configuration_set.cpp
@@ -19,7 +19,7 @@ protected:
 	int run()
 	{
 		CameraConfiguration config =
-			camera_->generateConfiguration({ Stream::VideoRecording() });
+			camera_->generateConfiguration({ StreamRole::VideoRecording });
 		StreamConfiguration *cfg = &config[config.front()];
 
 		if (!config.isValid()) {
diff --git a/test/camera/statemachine.cpp b/test/camera/statemachine.cpp
index bd2e61ff..7a74cd85 100644
--- a/test/camera/statemachine.cpp
+++ b/test/camera/statemachine.cpp
@@ -235,7 +235,7 @@ protected:
 
 	int run()
 	{
-		defconf_ = camera_->generateConfiguration({ Stream::VideoRecording() });
+		defconf_ = camera_->generateConfiguration({ StreamRole::VideoRecording });
 
 		if (testAvailable() != TestPass) {
 			cout << "State machine in Available state failed" << endl;