diff --git a/test/vpnor/Makefile.am.include b/test/vpnor/Makefile.am.include
index b71e8e0..e58f6ac 100644
--- a/test/vpnor/Makefile.am.include
+++ b/test/vpnor/Makefile.am.include
@@ -12,7 +12,7 @@
 test_vpnor_create_pnor_partition_table_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
 test_vpnor_create_pnor_partition_table_LDADD = $(VPNOR_LDADD)
 
-test_vpnor_create_read_window_vpnor_SOURCES = \
+test_vpnor_create_read_window_partition_exists_SOURCES = \
 	$(TEST_MBOX_VPNOR_SRCS) $(TEST_MOCK_SRCS) \
 	mboxd_msg.c \
 	mboxd_windows.c \
@@ -21,9 +21,9 @@
 	mboxd_pnor_partition_table.cpp \
 	mboxd_flash_virtual.cpp \
 	pnor_partition.cpp \
-	%reldir%/create_read_window_vpnor.cpp
-test_vpnor_create_read_window_vpnor_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
-test_vpnor_create_read_window_vpnor_LDADD = $(VPNOR_LDADD)
+	%reldir%/create_read_window_partition_exists.cpp
+test_vpnor_create_read_window_partition_exists_LDFLAGS = $(OESDK_TESTCASE_FLAGS)
+test_vpnor_create_read_window_partition_exists_LDADD = $(VPNOR_LDADD)
 
 test_vpnor_write_patch_SOURCES = \
 	$(TEST_MBOX_VPNOR_SRCS) \
@@ -68,7 +68,7 @@
 if VIRTUAL_PNOR_ENABLED
 check_PROGRAMS += \
 	%reldir%/create_pnor_partition_table \
-	%reldir%/create_read_window_vpnor \
+	%reldir%/create_read_window_partition_exists \
 	%reldir%/write_prsv \
 	%reldir%/write_ro \
 	%reldir%/write_rw \
diff --git a/test/vpnor/create_read_window_vpnor.cpp b/test/vpnor/create_read_window_partition_exists.cpp
similarity index 79%
rename from test/vpnor/create_read_window_vpnor.cpp
rename to test/vpnor/create_read_window_partition_exists.cpp
index 87deb9c..b051a57 100644
--- a/test/vpnor/create_read_window_vpnor.cpp
+++ b/test/vpnor/create_read_window_partition_exists.cpp
@@ -1,21 +1,5 @@
-/*
- * MBox Daemon Test File
- *
- * Copyright 2018 IBM
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+// SPDX-License-Identifier: Apache-2.0
+// Copyright (C) 2018 IBM Corp.
 
 #include "config.h"
 #include "mboxd_pnor_partition_table.h"