diff --git a/unittest/c-library/CMakeLists.txt b/unittest/c-library/CMakeLists.txt
index 8dde2b1967..90c57f1fa7 100644
--- a/unittest/c-library/CMakeLists.txt
+++ b/unittest/c-library/CMakeLists.txt
@@ -1,13 +1,13 @@
 
-add_executable(library-open library-open.cpp)
-target_link_libraries(library-open PRIVATE lammps GTest::GTest GTest::GTestMain)
-add_test(LibraryOpen library-open)
+add_executable(test_library_open test_library_open.cpp)
+target_link_libraries(test_library_open PRIVATE lammps GTest::GTest GTest::GTestMain)
+add_test(LibraryOpen test_library_open)
 
-add_executable(library-commands library-commands.cpp)
-target_link_libraries(library-commands PRIVATE lammps GTest::GTest GTest::GTestMain)
-add_test(LibraryCommands library-commands)
+add_executable(test_library_commands test_library_commands.cpp)
+target_link_libraries(test_library_commands PRIVATE lammps GTest::GTest GTest::GTestMain)
+add_test(LibraryCommands test_library_commands)
 
-add_executable(library-properties library-properties.cpp)
-target_link_libraries(library-properties PRIVATE lammps GTest::GTest GTest::GTestMain)
-add_test(LibraryProperties library-properties)
+add_executable(test_library_properties test_library_properties.cpp)
+target_link_libraries(test_library_properties PRIVATE lammps GTest::GTest GTest::GTestMain)
+add_test(LibraryProperties test_library_properties)
 
diff --git a/unittest/c-library/library-commands.cpp b/unittest/c-library/test_library_commands.cpp
similarity index 100%
rename from unittest/c-library/library-commands.cpp
rename to unittest/c-library/test_library_commands.cpp
diff --git a/unittest/c-library/library-open.cpp b/unittest/c-library/test_library_open.cpp
similarity index 100%
rename from unittest/c-library/library-open.cpp
rename to unittest/c-library/test_library_open.cpp
diff --git a/unittest/c-library/library-properties.cpp b/unittest/c-library/test_library_properties.cpp
similarity index 100%
rename from unittest/c-library/library-properties.cpp
rename to unittest/c-library/test_library_properties.cpp
diff --git a/unittest/cplusplus/CMakeLists.txt b/unittest/cplusplus/CMakeLists.txt
index 2137d99a29..90ef9a0282 100644
--- a/unittest/cplusplus/CMakeLists.txt
+++ b/unittest/cplusplus/CMakeLists.txt
@@ -1,8 +1,8 @@
 
-add_executable(lammps-class lammps-class.cpp)
-target_link_libraries(lammps-class PRIVATE lammps GTest::GMockMain GTest::GTest GTest::GMock)
-add_test(LammpsClass lammps-class)
+add_executable(test_lammps_class test_lammps_class.cpp)
+target_link_libraries(test_lammps_class PRIVATE lammps GTest::GMockMain GTest::GTest GTest::GMock)
+add_test(LammpsClass test_lammps_class)
 
-add_executable(input-class input-class.cpp)
-target_link_libraries(input-class PRIVATE lammps GTest::GTest GTest::GTestMain)
-add_test(InputClass input-class)
+add_executable(test_input_class test_input_class.cpp)
+target_link_libraries(test_input_class PRIVATE lammps GTest::GTest GTest::GTestMain)
+add_test(InputClass test_input_class)
diff --git a/unittest/cplusplus/input-class.cpp b/unittest/cplusplus/test_input_class.cpp
similarity index 100%
rename from unittest/cplusplus/input-class.cpp
rename to unittest/cplusplus/test_input_class.cpp
diff --git a/unittest/cplusplus/lammps-class.cpp b/unittest/cplusplus/test_lammps_class.cpp
similarity index 100%
rename from unittest/cplusplus/lammps-class.cpp
rename to unittest/cplusplus/test_lammps_class.cpp
diff --git a/unittest/fortran/CMakeLists.txt b/unittest/fortran/CMakeLists.txt
index 75382479d4..fe63802e8b 100644
--- a/unittest/fortran/CMakeLists.txt
+++ b/unittest/fortran/CMakeLists.txt
@@ -18,13 +18,13 @@ if(CMAKE_Fortran_COMPILER)
 
   add_library(flammps STATIC ${LAMMPS_FORTRAN_MODULE})
 
-  add_executable(fortran-create wrap-create.cpp fortran-create.f90)
-  target_link_libraries(fortran-create PRIVATE flammps lammps MPI::MPI_Fortran GTest::GTest GTest::GTestMain)
-  add_test(FortranOpen fortran-create)
+  add_executable(test_fortran_create wrap_create.cpp test_fortran_create.f90)
+  target_link_libraries(test_fortran_create PRIVATE flammps lammps MPI::MPI_Fortran GTest::GTest GTest::GTestMain)
+  add_test(FortranOpen test_fortran_create)
 
-  add_executable(fortran-commands wrap-commands.cpp fortran-commands.f90)
-  target_link_libraries(fortran-commands PRIVATE flammps lammps MPI::MPI_Fortran GTest::GTest GTest::GTestMain)
-  add_test(FortranCommands fortran-commands)
+  add_executable(test_fortran_commands wrap_commands.cpp test_fortran_commands.f90)
+  target_link_libraries(test_fortran_commands PRIVATE flammps lammps MPI::MPI_Fortran GTest::GTest GTest::GTestMain)
+  add_test(FortranCommands test_fortran_commands)
 else()
   message(STATUS "Skipping Tests for the LAMMPS Fortran Module: no Fortran compiler")
 endif()
diff --git a/unittest/fortran/fortran-commands.f90 b/unittest/fortran/test_fortran_commands.f90
similarity index 100%
rename from unittest/fortran/fortran-commands.f90
rename to unittest/fortran/test_fortran_commands.f90
diff --git a/unittest/fortran/fortran-create.f90 b/unittest/fortran/test_fortran_create.f90
similarity index 100%
rename from unittest/fortran/fortran-create.f90
rename to unittest/fortran/test_fortran_create.f90
diff --git a/unittest/fortran/wrap-commands.cpp b/unittest/fortran/wrap_commands.cpp
similarity index 100%
rename from unittest/fortran/wrap-commands.cpp
rename to unittest/fortran/wrap_commands.cpp
diff --git a/unittest/fortran/wrap-create.cpp b/unittest/fortran/wrap_create.cpp
similarity index 100%
rename from unittest/fortran/wrap-create.cpp
rename to unittest/fortran/wrap_create.cpp