From 4f57e140bf078bc27e1c5826929a3aa6fe46de93 Mon Sep 17 00:00:00 2001
From: Lei Zhang <antiagainst@google.com>
Date: Thu, 22 Sep 2016 11:05:30 -0400
Subject: [PATCH] Renaming test files to comply with Google style guide.

Also posfixing test files with `_test' to make it more clear.
---
 test/CMakeLists.txt                           | 121 +++++++++---------
 ...yContext.cpp => assembly_context_test.cpp} |   2 +-
 ...blyFormat.cpp => assembly_format_test.cpp} |   2 +-
 ...aryDestroy.cpp => binary_destroy_test.cpp} |   4 +-
 ...ianness.cpp => binary_endianness_test.cpp} |   2 +-
 ...aderGet.cpp => binary_header_get_test.cpp} |   2 +-
 ...{BinaryParse.cpp => binary_parse_test.cpp} |   4 +-
 ...al.cpp => binary_to_text.literal_test.cpp} |   4 +-
 ...naryToText.cpp => binary_to_text_test.cpp} |   4 +-
 .../{c_interface.cpp => c_interface_test.cpp} |   0
 ...abilitySet.cpp => capability_set_test.cpp} |   2 +-
 test/{Comment.cpp => comment_test.cpp}        |   4 +-
 ...p_interface.cpp => cpp_interface_test.cpp} |   0
 test/{diagnostic.cpp => diagnostic_test.cpp}  |   2 +-
 ...tGLSLstd450.cpp => ext_inst.glsl_test.cpp} |   2 +-
 ...penCL.std.cpp => ext_inst.opencl_test.cpp} |   4 +-
 test/{FixWord.cpp => fix_word_test.cpp}       |   2 +-
 ...er.cpp => generator_magic_number_test.cpp} |   2 +-
 test/{HexFloat.cpp => hex_float_test.cpp}     |   2 +
 ...mmediateInt.cpp => immediate_int_test.cpp} |   2 +-
 ...irvMacros.cpp => libspirv_macros_test.cpp} |   2 +-
 test/{test_log.cpp => log_test.cpp}           |   4 +-
 test/{NameMapper.cpp => name_mapper_test.cpp} |   4 +-
 test/{NamedId.cpp => named_id_test.cpp}       |   4 +-
 test/{OpcodeMake.cpp => opcode_make_test.cpp} |   2 +-
 ...p => opcode_require_capabilities_test.cpp} |   2 +-
 ...{OpcodeSplit.cpp => opcode_split_test.cpp} |   2 +-
 ...TableGet.cpp => opcode_table_get_test.cpp} |   2 +-
 ...ties.cpp => operand_capabilities_test.cpp} |   2 +-
 ...ndPattern.cpp => operand_pattern_test.cpp} |   2 +-
 test/{Operand.cpp => operand_test.cpp}        |   2 +-
 test/opt/CMakeLists.txt                       |  34 ++---
 ..._builder.cpp => assembly_builder_test.cpp} |   0
 .../{test_def_use.cpp => def_use_test.cpp}    |   0
 ...onst.cpp => eliminate_dead_const_test.cpp} |   0
 ... => fold_spec_const_op_composite_test.cpp} |   0
 ...c_const.cpp => freeze_spec_const_test.cpp} |   0
 ...t_instruction.cpp => instruction_test.cpp} |   2 +-
 ...{test_ir_loader.cpp => ir_loader_test.cpp} |   0
 .../{test_iterator.cpp => iterator_test.cpp}  |   0
 ...ebug_info.cpp => line_debug_info_test.cpp} |   0
 test/opt/{test_module.cpp => module_test.cpp} |   0
 ...pass_manager.cpp => pass_manager_test.cpp} |   0
 ... => set_spec_const_default_value_test.cpp} |   0
 ...bug_info.cpp => strip_debug_info_test.cpp} |   0
 ...type_manager.cpp => type_manager_test.cpp} |   0
 test/opt/{test_types.cpp => types_test.cpp}   |   0
 ...t_unify_const.cpp => unify_const_test.cpp} |   0
 test/opt/{test_utils.cpp => utils_test.cpp}   |   0
 ...{ParseNumber.cpp => parse_number_test.cpp} |   0
 ...eVersion.cpp => software_version_test.cpp} |   2 +-
 test/{TargetEnv.cpp => target_env_test.cpp}   |   2 +-
 test/{TestFixture.h => test_fixture.h}        |   2 +-
 ...{TextAdvance.cpp => text_advance_test.cpp} |   2 +-
 ...{TextDestroy.cpp => text_destroy_test.cpp} |   2 +-
 ...{TextLiteral.cpp => text_literal_test.cpp} |   4 +-
 ...wInst.cpp => text_start_new_inst_test.cpp} |   2 +-
 ...cpp => text_to_binary.annotation_test.cpp} |   4 +-
 ...er.cpp => text_to_binary.barrier_test.cpp} |   4 +-
 ...t.cpp => text_to_binary.constant_test.cpp} |   4 +-
 ...p => text_to_binary.control_flow_test.cpp} |   4 +-
 ...ebug.cpp => text_to_binary.debug_test.cpp} |   4 +-
 ...xt_to_binary.device_side_enqueue_test.cpp} |   4 +-
 ....cpp => text_to_binary.extension_test.cpp} |   4 +-
 ...n.cpp => text_to_binary.function_test.cpp} |   4 +-
 ...roup.cpp => text_to_binary.group_test.cpp} |   4 +-
 ...mage.cpp => text_to_binary.image_test.cpp} |   4 +-
 ...al.cpp => text_to_binary.literal_test.cpp} |   2 +-
 ...ory.cpp => text_to_binary.memory_test.cpp} |   4 +-
 ...neous.cpp => text_to_binary.misc_test.cpp} |   4 +-
 ...p => text_to_binary.mode_setting_test.cpp} |   4 +-
 ...p => text_to_binary.pipe_storage_test.cpp} |   2 +-
 ...text_to_binary.subgroup_dispatch_test.cpp} |   4 +-
 ... text_to_binary.type_declaration_test.cpp} |   4 +-
 ...xtToBinary.cpp => text_to_binary_test.cpp} |   4 +-
 ...TextWordGet.cpp => text_word_get_test.cpp} |   2 +-
 test/{UnitSPIRV.cpp => unit_spirv.cpp}        |   4 +-
 test/{UnitSPIRV.h => unit_spirv.h}            |   0
 test/val/CMakeLists.txt                       |   6 +-
 test/val/Validate.CFG.cpp                     |   4 +-
 test/val/Validate.Capability.cpp              |   4 +-
 test/val/Validate.Layout.cpp                  |   2 +-
 test/val/Validate.SSA.cpp                     |   2 +-
 test/val/ValidateFixtures.cpp                 |   2 +-
 test/val/ValidateFixtures.h                   |   2 +-
 test/val/ValidateID.cpp                       |   2 +-
 86 files changed, 174 insertions(+), 171 deletions(-)
 rename test/{AssemblyContext.cpp => assembly_context_test.cpp} (98%)
 rename test/{AssemblyFormat.cpp => assembly_format_test.cpp} (97%)
 rename test/{BinaryDestroy.cpp => binary_destroy_test.cpp} (96%)
 rename test/{BinaryEndianness.cpp => binary_endianness_test.cpp} (98%)
 rename test/{BinaryHeaderGet.cpp => binary_header_get_test.cpp} (99%)
 rename test/{BinaryParse.cpp => binary_parse_test.cpp} (99%)
 rename test/{BinaryToText.Literal.cpp => binary_to_text.literal_test.cpp} (98%)
 rename test/{BinaryToText.cpp => binary_to_text_test.cpp} (99%)
 rename test/{c_interface.cpp => c_interface_test.cpp} (100%)
 rename test/{CapabilitySet.cpp => capability_set_test.cpp} (99%)
 rename test/{Comment.cpp => comment_test.cpp} (96%)
 rename test/{cpp_interface.cpp => cpp_interface_test.cpp} (100%)
 rename test/{diagnostic.cpp => diagnostic_test.cpp} (99%)
 rename test/{ExtInstGLSLstd450.cpp => ext_inst.glsl_test.cpp} (99%)
 rename test/{ExtInst.OpenCL.std.cpp => ext_inst.opencl_test.cpp} (99%)
 rename test/{FixWord.cpp => fix_word_test.cpp} (98%)
 rename test/{GeneratorMagicNumber.cpp => generator_magic_number_test.cpp} (98%)
 rename test/{HexFloat.cpp => hex_float_test.cpp} (99%)
 rename test/{ImmediateInt.cpp => immediate_int_test.cpp} (99%)
 rename test/{LibspirvMacros.cpp => libspirv_macros_test.cpp} (97%)
 rename test/{test_log.cpp => log_test.cpp} (93%)
 rename test/{NameMapper.cpp => name_mapper_test.cpp} (99%)
 rename test/{NamedId.cpp => named_id_test.cpp} (98%)
 rename test/{OpcodeMake.cpp => opcode_make_test.cpp} (98%)
 rename test/{OpcodeRequiresCapabilities.cpp => opcode_require_capabilities_test.cpp} (99%)
 rename test/{OpcodeSplit.cpp => opcode_split_test.cpp} (97%)
 rename test/{OpcodeTableGet.cpp => opcode_table_get_test.cpp} (98%)
 rename test/{OperandCapabilities.cpp => operand_capabilities_test.cpp} (99%)
 rename test/{OperandPattern.cpp => operand_pattern_test.cpp} (99%)
 rename test/{Operand.cpp => operand_test.cpp} (99%)
 rename test/opt/{test_assembly_builder.cpp => assembly_builder_test.cpp} (100%)
 rename test/opt/{test_def_use.cpp => def_use_test.cpp} (100%)
 rename test/opt/{test_eliminate_dead_const.cpp => eliminate_dead_const_test.cpp} (100%)
 rename test/opt/{test_fold_spec_const_op_composite.cpp => fold_spec_const_op_composite_test.cpp} (100%)
 rename test/opt/{test_freeze_spec_const.cpp => freeze_spec_const_test.cpp} (100%)
 rename test/opt/{test_instruction.cpp => instruction_test.cpp} (99%)
 rename test/opt/{test_ir_loader.cpp => ir_loader_test.cpp} (100%)
 rename test/opt/{test_iterator.cpp => iterator_test.cpp} (100%)
 rename test/opt/{test_line_debug_info.cpp => line_debug_info_test.cpp} (100%)
 rename test/opt/{test_module.cpp => module_test.cpp} (100%)
 rename test/opt/{test_pass_manager.cpp => pass_manager_test.cpp} (100%)
 rename test/opt/{test_set_spec_const_default_value.cpp => set_spec_const_default_value_test.cpp} (100%)
 rename test/opt/{test_strip_debug_info.cpp => strip_debug_info_test.cpp} (100%)
 rename test/opt/{test_type_manager.cpp => type_manager_test.cpp} (100%)
 rename test/opt/{test_types.cpp => types_test.cpp} (100%)
 rename test/opt/{test_unify_const.cpp => unify_const_test.cpp} (100%)
 rename test/opt/{test_utils.cpp => utils_test.cpp} (100%)
 rename test/{ParseNumber.cpp => parse_number_test.cpp} (100%)
 rename test/{SoftwareVersion.cpp => software_version_test.cpp} (98%)
 rename test/{TargetEnv.cpp => target_env_test.cpp} (99%)
 rename test/{TestFixture.h => test_fixture.h} (99%)
 rename test/{TextAdvance.cpp => text_advance_test.cpp} (99%)
 rename test/{TextDestroy.cpp => text_destroy_test.cpp} (98%)
 rename test/{TextLiteral.cpp => text_literal_test.cpp} (99%)
 rename test/{TextStartsNewInst.cpp => text_start_new_inst_test.cpp} (99%)
 rename test/{TextToBinary.Annotation.cpp => text_to_binary.annotation_test.cpp} (99%)
 rename test/{TextToBinary.Barrier.cpp => text_to_binary.barrier_test.cpp} (99%)
 rename test/{TextToBinary.Constant.cpp => text_to_binary.constant_test.cpp} (99%)
 rename test/{TextToBinary.ControlFlow.cpp => text_to_binary.control_flow_test.cpp} (99%)
 rename test/{TextToBinary.Debug.cpp => text_to_binary.debug_test.cpp} (99%)
 rename test/{TextToBinary.DeviceSideEnqueue.cpp => text_to_binary.device_side_enqueue_test.cpp} (98%)
 rename test/{TextToBinary.Extension.cpp => text_to_binary.extension_test.cpp} (99%)
 rename test/{TextToBinary.Function.cpp => text_to_binary.function_test.cpp} (98%)
 rename test/{TextToBinary.Group.cpp => text_to_binary.group_test.cpp} (97%)
 rename test/{TextToBinary.Image.cpp => text_to_binary.image_test.cpp} (99%)
 rename test/{TextToBinary.Literal.cpp => text_to_binary.literal_test.cpp} (99%)
 rename test/{TextToBinary.Memory.cpp => text_to_binary.memory_test.cpp} (98%)
 rename test/{TextToBinary.Miscellaneous.cpp => text_to_binary.misc_test.cpp} (97%)
 rename test/{TextToBinary.ModeSetting.cpp => text_to_binary.mode_setting_test.cpp} (99%)
 rename test/{TextToBinary.PipeStorage.cpp => text_to_binary.pipe_storage_test.cpp} (99%)
 rename test/{TextToBinary.SubgroupDispatch.cpp => text_to_binary.subgroup_dispatch_test.cpp} (99%)
 rename test/{TextToBinary.TypeDeclaration.cpp => text_to_binary.type_declaration_test.cpp} (99%)
 rename test/{TextToBinary.cpp => text_to_binary_test.cpp} (99%)
 rename test/{TextWordGet.cpp => text_word_get_test.cpp} (99%)
 rename test/{UnitSPIRV.cpp => unit_spirv.cpp} (97%)
 rename test/{UnitSPIRV.h => unit_spirv.h} (100%)

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 5ce9d9fc..891828bd 100644
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -62,61 +62,62 @@ function(add_spvtools_unittest)
 endfunction()
 
 set(TEST_SOURCES
-  ${CMAKE_CURRENT_SOURCE_DIR}/TestFixture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/UnitSPIRV.h
+  test_fixture.h
+  unit_spirv.h
 
-  ${CMAKE_CURRENT_SOURCE_DIR}/AssemblyContext.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/AssemblyFormat.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/BinaryDestroy.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/BinaryEndianness.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/BinaryHeaderGet.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/BinaryParse.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/BinaryToText.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/BinaryToText.Literal.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/CapabilitySet.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/Comment.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/ExtInstGLSLstd450.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/ExtInst.OpenCL.std.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/FixWord.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/GeneratorMagicNumber.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/HexFloat.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/ImmediateInt.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/LibspirvMacros.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/NamedId.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/NameMapper.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/OpcodeMake.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/OpcodeRequiresCapabilities.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/OpcodeSplit.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/OpcodeTableGet.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/OperandCapabilities.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/Operand.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/OperandPattern.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/SoftwareVersion.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TargetEnv.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextAdvance.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextDestroy.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextLiteral.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextStartsNewInst.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Annotation.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Barrier.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Constant.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.ControlFlow.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Debug.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.DeviceSideEnqueue.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Extension.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Function.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Group.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Image.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Literal.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Memory.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.Miscellaneous.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.ModeSetting.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.PipeStorage.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.TypeDeclaration.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextToBinary.SubgroupDispatch.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/TextWordGet.cpp
-  ${CMAKE_CURRENT_SOURCE_DIR}/UnitSPIRV.cpp
+  assembly_context_test.cpp
+  assembly_format_test.cpp
+  binary_destroy_test.cpp
+  binary_endianness_test.cpp
+  binary_header_get_test.cpp
+  binary_parse_test.cpp
+  binary_to_text_test.cpp
+  binary_to_text.literal_test.cpp
+  capability_set_test.cpp
+  comment_test.cpp
+  ext_inst.glsl_test.cpp
+  ext_inst.opencl_test.cpp
+  fix_word_test.cpp
+  generator_magic_number_test.cpp
+  hex_float_test.cpp
+  immediate_int_test.cpp
+  libspirv_macros_test.cpp
+  named_id_test.cpp
+  name_mapper_test.cpp
+  opcode_make_test.cpp
+  opcode_require_capabilities_test.cpp
+  opcode_split_test.cpp
+  opcode_table_get_test.cpp
+  operand_capabilities_test.cpp
+  operand_test.cpp
+  operand_pattern_test.cpp
+  software_version_test.cpp
+  target_env_test.cpp
+  text_advance_test.cpp
+  text_destroy_test.cpp
+  text_literal_test.cpp
+  text_start_new_inst_test.cpp
+  text_to_binary.annotation_test.cpp
+  text_to_binary.barrier_test.cpp
+  text_to_binary.constant_test.cpp
+  text_to_binary.control_flow_test.cpp
+  text_to_binary_test.cpp
+  text_to_binary.debug_test.cpp
+  text_to_binary.device_side_enqueue_test.cpp
+  text_to_binary.extension_test.cpp
+  text_to_binary.function_test.cpp
+  text_to_binary.group_test.cpp
+  text_to_binary.image_test.cpp
+  text_to_binary.literal_test.cpp
+  text_to_binary.memory_test.cpp
+  text_to_binary.misc_test.cpp
+  text_to_binary.mode_setting_test.cpp
+  text_to_binary.pipe_storage_test.cpp
+  text_to_binary.type_declaration_test.cpp
+  text_to_binary.subgroup_dispatch_test.cpp
+  text_word_get_test.cpp
+
+  unit_spirv.cpp
 )
 
 add_spvtools_unittest(
@@ -126,27 +127,27 @@ add_spvtools_unittest(
 
 add_spvtools_unittest(
   TARGET diagnostic
-  SRCS diagnostic.cpp
+  SRCS diagnostic_test.cpp
   LIBS ${SPIRV_TOOLS})
 
 add_spvtools_unittest(
   TARGET c_interface
-  SRCS c_interface.cpp
+  SRCS c_interface_test.cpp
   LIBS ${SPIRV_TOOLS})
 
 add_spvtools_unittest(
   TARGET cpp_interface
-  SRCS cpp_interface.cpp
-  LIBS SPIRV-Tools-opt ${SPIRV_TOOLS})
+  SRCS cpp_interface_test.cpp
+  LIBS SPIRV-Tools-opt)
 
 add_spvtools_unittest(
   TARGET parse_number
-  SRCS ${CMAKE_CURRENT_SOURCE_DIR}/ParseNumber.cpp
+  SRCS parse_number_test.cpp
   LIBS ${SPIRV_TOOLS})
 
 add_spvtools_unittest(
   TARGET log
-  SRCS test_log.cpp
+  SRCS log_test.cpp
   LIBS ${SPIRV_TOOLS})
 
 add_subdirectory(opt)
diff --git a/test/AssemblyContext.cpp b/test/assembly_context_test.cpp
similarity index 98%
rename from test/AssemblyContext.cpp
rename to test/assembly_context_test.cpp
index e5308694..219a76ad 100644
--- a/test/AssemblyContext.cpp
+++ b/test/assembly_context_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include <vector>
 #include <gmock/gmock.h>
diff --git a/test/AssemblyFormat.cpp b/test/assembly_format_test.cpp
similarity index 97%
rename from test/AssemblyFormat.cpp
rename to test/assembly_format_test.cpp
index 891eee9d..953fb8a3 100644
--- a/test/AssemblyFormat.cpp
+++ b/test/assembly_format_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 
 namespace {
 
diff --git a/test/BinaryDestroy.cpp b/test/binary_destroy_test.cpp
similarity index 96%
rename from test/BinaryDestroy.cpp
rename to test/binary_destroy_test.cpp
index 9cac3517..2df8379c 100644
--- a/test/BinaryDestroy.cpp
+++ b/test/binary_destroy_test.cpp
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 
 namespace {
 
diff --git a/test/BinaryEndianness.cpp b/test/binary_endianness_test.cpp
similarity index 98%
rename from test/BinaryEndianness.cpp
rename to test/binary_endianness_test.cpp
index c23115ef..343c17e2 100644
--- a/test/BinaryEndianness.cpp
+++ b/test/binary_endianness_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 namespace {
 
diff --git a/test/BinaryHeaderGet.cpp b/test/binary_header_get_test.cpp
similarity index 99%
rename from test/BinaryHeaderGet.cpp
rename to test/binary_header_get_test.cpp
index eed808c3..047d3a02 100644
--- a/test/BinaryHeaderGet.cpp
+++ b/test/binary_header_get_test.cpp
@@ -13,7 +13,7 @@
 // limitations under the License.
 
 #include "source/spirv_constant.h"
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 namespace {
 
diff --git a/test/BinaryParse.cpp b/test/binary_parse_test.cpp
similarity index 99%
rename from test/BinaryParse.cpp
rename to test/binary_parse_test.cpp
index 4ccf84df..138092c7 100644
--- a/test/BinaryParse.cpp
+++ b/test/binary_parse_test.cpp
@@ -16,8 +16,8 @@
 #include <string>
 #include <vector>
 
-#include "TestFixture.h"
-#include "UnitSPIRV.h"
+#include "test_fixture.h"
+#include "unit_spirv.h"
 #include "gmock/gmock.h"
 #include "source/message.h"
 #include "source/table.h"
diff --git a/test/BinaryToText.Literal.cpp b/test/binary_to_text.literal_test.cpp
similarity index 98%
rename from test/BinaryToText.Literal.cpp
rename to test/binary_to_text.literal_test.cpp
index 67b9678a..9201f4a0 100644
--- a/test/BinaryToText.Literal.cpp
+++ b/test/binary_to_text.literal_test.cpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include "gmock/gmock.h"
-#include "TestFixture.h"
+#include "test_fixture.h"
 
 using ::testing::Eq;
 
diff --git a/test/BinaryToText.cpp b/test/binary_to_text_test.cpp
similarity index 99%
rename from test/BinaryToText.cpp
rename to test/binary_to_text_test.cpp
index 1d28e9de..78f9aff2 100644
--- a/test/BinaryToText.cpp
+++ b/test/binary_to_text_test.cpp
@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include <sstream>
 
 #include "gmock/gmock.h"
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 #include "source/spirv_constant.h"
 
 namespace {
diff --git a/test/c_interface.cpp b/test/c_interface_test.cpp
similarity index 100%
rename from test/c_interface.cpp
rename to test/c_interface_test.cpp
diff --git a/test/CapabilitySet.cpp b/test/capability_set_test.cpp
similarity index 99%
rename from test/CapabilitySet.cpp
rename to test/capability_set_test.cpp
index aaae54e4..4a0111d1 100644
--- a/test/CapabilitySet.cpp
+++ b/test/capability_set_test.cpp
@@ -16,7 +16,7 @@
 #include "gmock/gmock.h"
 
 #include "enum_set.h"
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 namespace {
 
diff --git a/test/Comment.cpp b/test/comment_test.cpp
similarity index 96%
rename from test/Comment.cpp
rename to test/comment_test.cpp
index d708a113..f60b7918 100644
--- a/test/Comment.cpp
+++ b/test/comment_test.cpp
@@ -13,8 +13,8 @@
 // limitations under the License.
 
 #include "gmock/gmock.h"
-#include "TestFixture.h"
-#include "UnitSPIRV.h"
+#include "test_fixture.h"
+#include "unit_spirv.h"
 
 namespace {
 
diff --git a/test/cpp_interface.cpp b/test/cpp_interface_test.cpp
similarity index 100%
rename from test/cpp_interface.cpp
rename to test/cpp_interface_test.cpp
diff --git a/test/diagnostic.cpp b/test/diagnostic_test.cpp
similarity index 99%
rename from test/diagnostic.cpp
rename to test/diagnostic_test.cpp
index feb5403b..65af274d 100644
--- a/test/diagnostic.cpp
+++ b/test/diagnostic_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 namespace {
 
diff --git a/test/ExtInstGLSLstd450.cpp b/test/ext_inst.glsl_test.cpp
similarity index 99%
rename from test/ExtInstGLSLstd450.cpp
rename to test/ext_inst.glsl_test.cpp
index d81a4446..8502cfdb 100644
--- a/test/ExtInstGLSLstd450.cpp
+++ b/test/ext_inst.glsl_test.cpp
@@ -15,7 +15,7 @@
 #include <algorithm>
 #include <vector>
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 #include "spirv/1.0/GLSL.std.450.h"
 
 namespace {
diff --git a/test/ExtInst.OpenCL.std.cpp b/test/ext_inst.opencl_test.cpp
similarity index 99%
rename from test/ExtInst.OpenCL.std.cpp
rename to test/ext_inst.opencl_test.cpp
index df463d36..36854153 100644
--- a/test/ExtInst.OpenCL.std.cpp
+++ b/test/ext_inst.opencl_test.cpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include <gmock/gmock.h>
-#include "TestFixture.h"
+#include "test_fixture.h"
 #include "spirv/1.0/OpenCL.std.h"
 
 namespace {
diff --git a/test/FixWord.cpp b/test/fix_word_test.cpp
similarity index 98%
rename from test/FixWord.cpp
rename to test/fix_word_test.cpp
index e5514e68..45ba6e63 100644
--- a/test/FixWord.cpp
+++ b/test/fix_word_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 namespace {
 
diff --git a/test/GeneratorMagicNumber.cpp b/test/generator_magic_number_test.cpp
similarity index 98%
rename from test/GeneratorMagicNumber.cpp
rename to test/generator_magic_number_test.cpp
index 44278250..c3f30f63 100644
--- a/test/GeneratorMagicNumber.cpp
+++ b/test/generator_magic_number_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include <gmock/gmock.h>
 
diff --git a/test/HexFloat.cpp b/test/hex_float_test.cpp
similarity index 99%
rename from test/HexFloat.cpp
rename to test/hex_float_test.cpp
index 5b97f4ac..33933df9 100644
--- a/test/HexFloat.cpp
+++ b/test/hex_float_test.cpp
@@ -20,7 +20,9 @@
 #include <tuple>
 
 #include <gmock/gmock.h>
+
 #include "source/util/hex_float.h"
+#include "unit_spirv.h"
 
 namespace {
 using ::testing::Eq;
diff --git a/test/ImmediateInt.cpp b/test/immediate_int_test.cpp
similarity index 99%
rename from test/ImmediateInt.cpp
rename to test/immediate_int_test.cpp
index bc2ff3c6..30a8fb03 100644
--- a/test/ImmediateInt.cpp
+++ b/test/immediate_int_test.cpp
@@ -18,7 +18,7 @@
 
 #include <gmock/gmock.h>
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 #include "source/util/bitutils.h"
 
 namespace {
diff --git a/test/LibspirvMacros.cpp b/test/libspirv_macros_test.cpp
similarity index 97%
rename from test/LibspirvMacros.cpp
rename to test/libspirv_macros_test.cpp
index ce84ceae..5b9b5413 100644
--- a/test/LibspirvMacros.cpp
+++ b/test/libspirv_macros_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 namespace {
 
diff --git a/test/test_log.cpp b/test/log_test.cpp
similarity index 93%
rename from test/test_log.cpp
rename to test/log_test.cpp
index fd258b17..f14f77d8 100644
--- a/test/test_log.cpp
+++ b/test/log_test.cpp
@@ -29,7 +29,7 @@ TEST(Log, Unimplemented) {
                                 const spv_position_t&, const char* message) {
     ++invocation;
     EXPECT_EQ(SPV_MSG_INTERNAL_ERROR, level);
-    EXPECT_THAT(source, MatchesRegex(".*test_log.cpp$"));
+    EXPECT_THAT(source, MatchesRegex(".*log_test.cpp$"));
     EXPECT_STREQ("unimplemented: the-ultimite-feature", message);
   };
 
@@ -43,7 +43,7 @@ TEST(Log, Unreachable) {
                                 const spv_position_t&, const char* message) {
     ++invocation;
     EXPECT_EQ(SPV_MSG_INTERNAL_ERROR, level);
-    EXPECT_THAT(source, MatchesRegex(".*test_log.cpp$"));
+    EXPECT_THAT(source, MatchesRegex(".*log_test.cpp$"));
     EXPECT_STREQ("unreachable", message);
   };
 
diff --git a/test/NameMapper.cpp b/test/name_mapper_test.cpp
similarity index 99%
rename from test/NameMapper.cpp
rename to test/name_mapper_test.cpp
index 7a470f36..6c7755bb 100644
--- a/test/NameMapper.cpp
+++ b/test/name_mapper_test.cpp
@@ -14,8 +14,8 @@
 
 #include "gmock/gmock.h"
 
-#include "TestFixture.h"
-#include "UnitSPIRV.h"
+#include "test_fixture.h"
+#include "unit_spirv.h"
 
 #include "source/name_mapper.h"
 
diff --git a/test/NamedId.cpp b/test/named_id_test.cpp
similarity index 98%
rename from test/NamedId.cpp
rename to test/named_id_test.cpp
index 7ece9c93..68946bb3 100644
--- a/test/NamedId.cpp
+++ b/test/named_id_test.cpp
@@ -14,8 +14,8 @@
 
 #include <vector>
 
-#include "TestFixture.h"
-#include "UnitSPIRV.h"
+#include "test_fixture.h"
+#include "unit_spirv.h"
 
 namespace {
 
diff --git a/test/OpcodeMake.cpp b/test/opcode_make_test.cpp
similarity index 98%
rename from test/OpcodeMake.cpp
rename to test/opcode_make_test.cpp
index 5794a496..5353b719 100644
--- a/test/OpcodeMake.cpp
+++ b/test/opcode_make_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 namespace {
 
diff --git a/test/OpcodeRequiresCapabilities.cpp b/test/opcode_require_capabilities_test.cpp
similarity index 99%
rename from test/OpcodeRequiresCapabilities.cpp
rename to test/opcode_require_capabilities_test.cpp
index 39de7f9e..31a17366 100644
--- a/test/OpcodeRequiresCapabilities.cpp
+++ b/test/opcode_require_capabilities_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include "enum_set.h"
 
diff --git a/test/OpcodeSplit.cpp b/test/opcode_split_test.cpp
similarity index 97%
rename from test/OpcodeSplit.cpp
rename to test/opcode_split_test.cpp
index 197018f0..f42d903a 100644
--- a/test/OpcodeSplit.cpp
+++ b/test/opcode_split_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 namespace {
 
diff --git a/test/OpcodeTableGet.cpp b/test/opcode_table_get_test.cpp
similarity index 98%
rename from test/OpcodeTableGet.cpp
rename to test/opcode_table_get_test.cpp
index 67c46ae0..f2272f07 100644
--- a/test/OpcodeTableGet.cpp
+++ b/test/opcode_table_get_test.cpp
@@ -14,7 +14,7 @@
 
 #include <gmock/gmock.h>
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 namespace {
 
diff --git a/test/OperandCapabilities.cpp b/test/operand_capabilities_test.cpp
similarity index 99%
rename from test/OperandCapabilities.cpp
rename to test/operand_capabilities_test.cpp
index 5673ef77..20a7525c 100644
--- a/test/OperandCapabilities.cpp
+++ b/test/operand_capabilities_test.cpp
@@ -19,7 +19,7 @@
 #include "gmock/gmock.h"
 
 #include "enum_set.h"
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 namespace {
 
diff --git a/test/OperandPattern.cpp b/test/operand_pattern_test.cpp
similarity index 99%
rename from test/OperandPattern.cpp
rename to test/operand_pattern_test.cpp
index eee7b6d2..be4fffdc 100644
--- a/test/OperandPattern.cpp
+++ b/test/operand_pattern_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include "gmock/gmock.h"
 #include "source/operand.h"
diff --git a/test/Operand.cpp b/test/operand_test.cpp
similarity index 99%
rename from test/Operand.cpp
rename to test/operand_test.cpp
index b5e48975..a9056a24 100644
--- a/test/Operand.cpp
+++ b/test/operand_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 namespace {
 
diff --git a/test/opt/CMakeLists.txt b/test/opt/CMakeLists.txt
index 6a7d604d..8e987935 100644
--- a/test/opt/CMakeLists.txt
+++ b/test/opt/CMakeLists.txt
@@ -13,88 +13,88 @@
 # limitations under the License.
 
 add_spvtools_unittest(TARGET instruction
-  SRCS test_instruction.cpp
+  SRCS instruction_test.cpp
   LIBS SPIRV-Tools-opt
 )
 
 add_spvtools_unittest(TARGET ir_loader
-  SRCS test_ir_loader.cpp
+  SRCS ir_loader_test.cpp
   LIBS SPIRV-Tools-opt
 )
 
 add_spvtools_unittest(TARGET pass_manager
   SRCS module_utils.h
-       test_pass_manager.cpp
+       pass_manager_test.cpp
   LIBS SPIRV-Tools-opt
 )
 
 add_spvtools_unittest(TARGET pass_strip_debug_info
-  SRCS test_strip_debug_info.cpp pass_utils.cpp
+  SRCS strip_debug_info_test.cpp pass_utils.cpp
   LIBS SPIRV-Tools-opt
 )
 
 add_spvtools_unittest(TARGET pass_freeze_spec_const
-  SRCS test_freeze_spec_const.cpp pass_utils.cpp
+  SRCS freeze_spec_const_test.cpp pass_utils.cpp
   LIBS SPIRV-Tools-opt
 )
 
 add_spvtools_unittest(TARGET pass_eliminate_dead_const
-  SRCS test_eliminate_dead_const.cpp pass_utils.cpp
+  SRCS eliminate_dead_const_test.cpp pass_utils.cpp
   LIBS SPIRV-Tools-opt
 )
 
 add_spvtools_unittest(TARGET pass_utils
-  SRCS test_utils.cpp pass_utils.cpp
+  SRCS utils_test.cpp pass_utils.cpp
   LIBS SPIRV-Tools-opt
 )
 
 add_spvtools_unittest(TARGET def_use
-  SRCS test_def_use.cpp pass_utils.cpp
+  SRCS def_use_test.cpp pass_utils.cpp
   LIBS SPIRV-Tools-opt
 )
 
 add_spvtools_unittest(TARGET assembly_builder
-  SRCS test_assembly_builder.cpp pass_utils.cpp
+  SRCS assembly_builder_test.cpp pass_utils.cpp
   LIBS SPIRV-Tools-opt
 )
 
 add_spvtools_unittest(TARGET types
-  SRCS test_types.cpp
+  SRCS types_test.cpp
   LIBS SPIRV-Tools-opt
 )
 
 add_spvtools_unittest(TARGET type_manager
-  SRCS test_type_manager.cpp
+  SRCS type_manager_test.cpp
   LIBS SPIRV-Tools-opt
 )
 
 add_spvtools_unittest(TARGET iterator
-  SRCS test_iterator.cpp
+  SRCS iterator_test.cpp
   LIBS SPIRV-Tools-opt
 )
 
 add_spvtools_unittest(TARGET module
   SRCS module_utils.h
-       test_module.cpp
+       module_test.cpp
   LIBS SPIRV-Tools-opt
 )
 
 add_spvtools_unittest(TARGET pass_fold_spec_const_op_composite
-  SRCS test_fold_spec_const_op_composite.cpp pass_utils.cpp
+  SRCS fold_spec_const_op_composite_test.cpp pass_utils.cpp
   LIBS SPIRV-Tools-opt
 )
 
 add_spvtools_unittest(TARGET pass_unify_const
-  SRCS test_unify_const.cpp
+  SRCS unify_const_test.cpp
   LIBS SPIRV-Tools-opt
 )
 
 add_spvtools_unittest(TARGET pass_set_spec_const_default_value
-  SRCS test_set_spec_const_default_value.cpp pass_utils.cpp
+  SRCS set_spec_const_default_value_test.cpp pass_utils.cpp
   LIBS SPIRV-Tools-opt
 )
 
 add_spvtools_unittest(TARGET line_debug_info
-  SRCS test_line_debug_info.cpp pass_utils.cpp
+  SRCS line_debug_info_test.cpp pass_utils.cpp
   LIBS SPIRV-Tools-opt
 )
diff --git a/test/opt/test_assembly_builder.cpp b/test/opt/assembly_builder_test.cpp
similarity index 100%
rename from test/opt/test_assembly_builder.cpp
rename to test/opt/assembly_builder_test.cpp
diff --git a/test/opt/test_def_use.cpp b/test/opt/def_use_test.cpp
similarity index 100%
rename from test/opt/test_def_use.cpp
rename to test/opt/def_use_test.cpp
diff --git a/test/opt/test_eliminate_dead_const.cpp b/test/opt/eliminate_dead_const_test.cpp
similarity index 100%
rename from test/opt/test_eliminate_dead_const.cpp
rename to test/opt/eliminate_dead_const_test.cpp
diff --git a/test/opt/test_fold_spec_const_op_composite.cpp b/test/opt/fold_spec_const_op_composite_test.cpp
similarity index 100%
rename from test/opt/test_fold_spec_const_op_composite.cpp
rename to test/opt/fold_spec_const_op_composite_test.cpp
diff --git a/test/opt/test_freeze_spec_const.cpp b/test/opt/freeze_spec_const_test.cpp
similarity index 100%
rename from test/opt/test_freeze_spec_const.cpp
rename to test/opt/freeze_spec_const_test.cpp
diff --git a/test/opt/test_instruction.cpp b/test/opt/instruction_test.cpp
similarity index 99%
rename from test/opt/test_instruction.cpp
rename to test/opt/instruction_test.cpp
index af6593f5..608229f4 100644
--- a/test/opt/test_instruction.cpp
+++ b/test/opt/instruction_test.cpp
@@ -17,7 +17,7 @@
 #include "gmock/gmock.h"
 
 #include "spirv-tools/libspirv.h"
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 namespace {
 
diff --git a/test/opt/test_ir_loader.cpp b/test/opt/ir_loader_test.cpp
similarity index 100%
rename from test/opt/test_ir_loader.cpp
rename to test/opt/ir_loader_test.cpp
diff --git a/test/opt/test_iterator.cpp b/test/opt/iterator_test.cpp
similarity index 100%
rename from test/opt/test_iterator.cpp
rename to test/opt/iterator_test.cpp
diff --git a/test/opt/test_line_debug_info.cpp b/test/opt/line_debug_info_test.cpp
similarity index 100%
rename from test/opt/test_line_debug_info.cpp
rename to test/opt/line_debug_info_test.cpp
diff --git a/test/opt/test_module.cpp b/test/opt/module_test.cpp
similarity index 100%
rename from test/opt/test_module.cpp
rename to test/opt/module_test.cpp
diff --git a/test/opt/test_pass_manager.cpp b/test/opt/pass_manager_test.cpp
similarity index 100%
rename from test/opt/test_pass_manager.cpp
rename to test/opt/pass_manager_test.cpp
diff --git a/test/opt/test_set_spec_const_default_value.cpp b/test/opt/set_spec_const_default_value_test.cpp
similarity index 100%
rename from test/opt/test_set_spec_const_default_value.cpp
rename to test/opt/set_spec_const_default_value_test.cpp
diff --git a/test/opt/test_strip_debug_info.cpp b/test/opt/strip_debug_info_test.cpp
similarity index 100%
rename from test/opt/test_strip_debug_info.cpp
rename to test/opt/strip_debug_info_test.cpp
diff --git a/test/opt/test_type_manager.cpp b/test/opt/type_manager_test.cpp
similarity index 100%
rename from test/opt/test_type_manager.cpp
rename to test/opt/type_manager_test.cpp
diff --git a/test/opt/test_types.cpp b/test/opt/types_test.cpp
similarity index 100%
rename from test/opt/test_types.cpp
rename to test/opt/types_test.cpp
diff --git a/test/opt/test_unify_const.cpp b/test/opt/unify_const_test.cpp
similarity index 100%
rename from test/opt/test_unify_const.cpp
rename to test/opt/unify_const_test.cpp
diff --git a/test/opt/test_utils.cpp b/test/opt/utils_test.cpp
similarity index 100%
rename from test/opt/test_utils.cpp
rename to test/opt/utils_test.cpp
diff --git a/test/ParseNumber.cpp b/test/parse_number_test.cpp
similarity index 100%
rename from test/ParseNumber.cpp
rename to test/parse_number_test.cpp
diff --git a/test/SoftwareVersion.cpp b/test/software_version_test.cpp
similarity index 98%
rename from test/SoftwareVersion.cpp
rename to test/software_version_test.cpp
index da64e1c5..e1b35044 100644
--- a/test/SoftwareVersion.cpp
+++ b/test/software_version_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include <sstream>
 
diff --git a/test/TargetEnv.cpp b/test/target_env_test.cpp
similarity index 99%
rename from test/TargetEnv.cpp
rename to test/target_env_test.cpp
index c3d0543a..4df5f943 100644
--- a/test/TargetEnv.cpp
+++ b/test/target_env_test.cpp
@@ -14,7 +14,7 @@
 
 #include <gmock/gmock.h>
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include "source/spirv_target_env.h"
 
diff --git a/test/TestFixture.h b/test/test_fixture.h
similarity index 99%
rename from test/TestFixture.h
rename to test/test_fixture.h
index f3cd1e40..e2948a89 100644
--- a/test/TestFixture.h
+++ b/test/test_fixture.h
@@ -15,7 +15,7 @@
 #ifndef LIBSPIRV_TEST_TEST_FIXTURE_H_
 #define LIBSPIRV_TEST_TEST_FIXTURE_H_
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 namespace spvtest {
 
diff --git a/test/TextAdvance.cpp b/test/text_advance_test.cpp
similarity index 99%
rename from test/TextAdvance.cpp
rename to test/text_advance_test.cpp
index ec430d61..ffc8dbb2 100644
--- a/test/TextAdvance.cpp
+++ b/test/text_advance_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 namespace {
 
diff --git a/test/TextDestroy.cpp b/test/text_destroy_test.cpp
similarity index 98%
rename from test/TextDestroy.cpp
rename to test/text_destroy_test.cpp
index 61522f68..c956d72c 100644
--- a/test/TextDestroy.cpp
+++ b/test/text_destroy_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 namespace {
 
diff --git a/test/TextLiteral.cpp b/test/text_literal_test.cpp
similarity index 99%
rename from test/TextLiteral.cpp
rename to test/text_literal_test.cpp
index c866bda7..e41a0146 100644
--- a/test/TextLiteral.cpp
+++ b/test/text_literal_test.cpp
@@ -12,9 +12,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 #include "gmock/gmock.h"
 #include "message.h"
 
diff --git a/test/TextStartsNewInst.cpp b/test/text_start_new_inst_test.cpp
similarity index 99%
rename from test/TextStartsNewInst.cpp
rename to test/text_start_new_inst_test.cpp
index c7c6d391..6c3e5541 100644
--- a/test/TextStartsNewInst.cpp
+++ b/test/text_start_new_inst_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include <string>
 
diff --git a/test/TextToBinary.Annotation.cpp b/test/text_to_binary.annotation_test.cpp
similarity index 99%
rename from test/TextToBinary.Annotation.cpp
rename to test/text_to_binary.annotation_test.cpp
index eb6bbf78..e0fe84e7 100644
--- a/test/TextToBinary.Annotation.cpp
+++ b/test/text_to_binary.annotation_test.cpp
@@ -15,12 +15,12 @@
 // Assembler tests for instructions in the "Annotation" section of the
 // SPIR-V spec.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include <sstream>
 #include <tuple>
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 #include "gmock/gmock.h"
 
 namespace {
diff --git a/test/TextToBinary.Barrier.cpp b/test/text_to_binary.barrier_test.cpp
similarity index 99%
rename from test/TextToBinary.Barrier.cpp
rename to test/text_to_binary.barrier_test.cpp
index 287ec311..c086caa0 100644
--- a/test/TextToBinary.Barrier.cpp
+++ b/test/text_to_binary.barrier_test.cpp
@@ -15,9 +15,9 @@
 // Assembler tests for instructions in the "Barrier Instructions" section
 // of the SPIR-V spec.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 #include "gmock/gmock.h"
 
 namespace {
diff --git a/test/TextToBinary.Constant.cpp b/test/text_to_binary.constant_test.cpp
similarity index 99%
rename from test/TextToBinary.Constant.cpp
rename to test/text_to_binary.constant_test.cpp
index b27598ee..d975f1c9 100644
--- a/test/TextToBinary.Constant.cpp
+++ b/test/text_to_binary.constant_test.cpp
@@ -15,12 +15,12 @@
 // Assembler tests for instructions in the "Group Instrucions" section of the
 // SPIR-V spec.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include <cstdint>
 #include <limits>
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 #include "gmock/gmock.h"
 
 namespace {
diff --git a/test/TextToBinary.ControlFlow.cpp b/test/text_to_binary.control_flow_test.cpp
similarity index 99%
rename from test/TextToBinary.ControlFlow.cpp
rename to test/text_to_binary.control_flow_test.cpp
index eec8ce81..8152bf24 100644
--- a/test/TextToBinary.ControlFlow.cpp
+++ b/test/text_to_binary.control_flow_test.cpp
@@ -19,9 +19,9 @@
 #include <tuple>
 #include <vector>
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 #include "gmock/gmock.h"
 
 namespace {
diff --git a/test/TextToBinary.Debug.cpp b/test/text_to_binary.debug_test.cpp
similarity index 99%
rename from test/TextToBinary.Debug.cpp
rename to test/text_to_binary.debug_test.cpp
index 2be9be7d..cefaaec4 100644
--- a/test/TextToBinary.Debug.cpp
+++ b/test/text_to_binary.debug_test.cpp
@@ -15,11 +15,11 @@
 // Assembler tests for instructions in the "Debug" section of the
 // SPIR-V spec.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include <string>
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 #include "gmock/gmock.h"
 
 namespace {
diff --git a/test/TextToBinary.DeviceSideEnqueue.cpp b/test/text_to_binary.device_side_enqueue_test.cpp
similarity index 98%
rename from test/TextToBinary.DeviceSideEnqueue.cpp
rename to test/text_to_binary.device_side_enqueue_test.cpp
index eaa108ed..852eef7a 100644
--- a/test/TextToBinary.DeviceSideEnqueue.cpp
+++ b/test/text_to_binary.device_side_enqueue_test.cpp
@@ -15,10 +15,10 @@
 // Assembler tests for instructions in the "Device-Side Enqueue Instructions"
 // section of the SPIR-V spec.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include "gmock/gmock.h"
-#include "TestFixture.h"
+#include "test_fixture.h"
 
 namespace {
 using spvtest::MakeInstruction;
diff --git a/test/TextToBinary.Extension.cpp b/test/text_to_binary.extension_test.cpp
similarity index 99%
rename from test/TextToBinary.Extension.cpp
rename to test/text_to_binary.extension_test.cpp
index b4508f20..44c9b1bf 100644
--- a/test/TextToBinary.Extension.cpp
+++ b/test/text_to_binary.extension_test.cpp
@@ -15,9 +15,9 @@
 // Assembler tests for instructions in the "Extension Instruction" section
 // of the SPIR-V spec.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 #include "gmock/gmock.h"
 #include "spirv/1.0/GLSL.std.450.h"
 #include "spirv/1.0/OpenCL.std.h"
diff --git a/test/TextToBinary.Function.cpp b/test/text_to_binary.function_test.cpp
similarity index 98%
rename from test/TextToBinary.Function.cpp
rename to test/text_to_binary.function_test.cpp
index 4246bad9..5f1b72a0 100644
--- a/test/TextToBinary.Function.cpp
+++ b/test/text_to_binary.function_test.cpp
@@ -15,10 +15,10 @@
 // Assembler tests for instructions in the "Function" section of the
 // SPIR-V spec.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include "gmock/gmock.h"
-#include "TestFixture.h"
+#include "test_fixture.h"
 
 namespace {
 
diff --git a/test/TextToBinary.Group.cpp b/test/text_to_binary.group_test.cpp
similarity index 97%
rename from test/TextToBinary.Group.cpp
rename to test/text_to_binary.group_test.cpp
index fc41646f..6fb57066 100644
--- a/test/TextToBinary.Group.cpp
+++ b/test/text_to_binary.group_test.cpp
@@ -15,10 +15,10 @@
 // Assembler tests for instructions in the "Group Instrucions" section of the
 // SPIR-V spec.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include "gmock/gmock.h"
-#include "TestFixture.h"
+#include "test_fixture.h"
 
 namespace {
 
diff --git a/test/TextToBinary.Image.cpp b/test/text_to_binary.image_test.cpp
similarity index 99%
rename from test/TextToBinary.Image.cpp
rename to test/text_to_binary.image_test.cpp
index 14f389dd..51dd52ea 100644
--- a/test/TextToBinary.Image.cpp
+++ b/test/text_to_binary.image_test.cpp
@@ -15,10 +15,10 @@
 // Assembler tests for instructions in the "Image Instructions" section of
 // the SPIR-V spec.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include "gmock/gmock.h"
-#include "TestFixture.h"
+#include "test_fixture.h"
 
 namespace {
 
diff --git a/test/TextToBinary.Literal.cpp b/test/text_to_binary.literal_test.cpp
similarity index 99%
rename from test/TextToBinary.Literal.cpp
rename to test/text_to_binary.literal_test.cpp
index a4a55e83..46355818 100644
--- a/test/TextToBinary.Literal.cpp
+++ b/test/text_to_binary.literal_test.cpp
@@ -14,7 +14,7 @@
 
 // Assembler tests for literal numbers and literal strings.
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 
 namespace {
 
diff --git a/test/TextToBinary.Memory.cpp b/test/text_to_binary.memory_test.cpp
similarity index 98%
rename from test/TextToBinary.Memory.cpp
rename to test/text_to_binary.memory_test.cpp
index 9fbde994..2146fce6 100644
--- a/test/TextToBinary.Memory.cpp
+++ b/test/text_to_binary.memory_test.cpp
@@ -15,12 +15,12 @@
 // Assembler tests for instructions in the "Memory Instructions" section of
 // the SPIR-V spec.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include <sstream>
 
 #include "gmock/gmock.h"
-#include "TestFixture.h"
+#include "test_fixture.h"
 
 namespace {
 
diff --git a/test/TextToBinary.Miscellaneous.cpp b/test/text_to_binary.misc_test.cpp
similarity index 97%
rename from test/TextToBinary.Miscellaneous.cpp
rename to test/text_to_binary.misc_test.cpp
index c5acd940..470bdca4 100644
--- a/test/TextToBinary.Miscellaneous.cpp
+++ b/test/text_to_binary.misc_test.cpp
@@ -15,9 +15,9 @@
 // Assembler tests for instructions in the "Miscellaneous" section of the
 // SPIR-V spec.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 #include "gmock/gmock.h"
 
 namespace {
diff --git a/test/TextToBinary.ModeSetting.cpp b/test/text_to_binary.mode_setting_test.cpp
similarity index 99%
rename from test/TextToBinary.ModeSetting.cpp
rename to test/text_to_binary.mode_setting_test.cpp
index 8d47010f..27991b2a 100644
--- a/test/TextToBinary.ModeSetting.cpp
+++ b/test/text_to_binary.mode_setting_test.cpp
@@ -15,9 +15,9 @@
 // Assembler tests for instructions in the "Mode-Setting" section of the
 // SPIR-V spec.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 #include "gmock/gmock.h"
 
 namespace {
diff --git a/test/TextToBinary.PipeStorage.cpp b/test/text_to_binary.pipe_storage_test.cpp
similarity index 99%
rename from test/TextToBinary.PipeStorage.cpp
rename to test/text_to_binary.pipe_storage_test.cpp
index 3537d83b..66d13eaf 100644
--- a/test/TextToBinary.PipeStorage.cpp
+++ b/test/text_to_binary.pipe_storage_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 #include "gmock/gmock.h"
 
 namespace {
diff --git a/test/TextToBinary.SubgroupDispatch.cpp b/test/text_to_binary.subgroup_dispatch_test.cpp
similarity index 99%
rename from test/TextToBinary.SubgroupDispatch.cpp
rename to test/text_to_binary.subgroup_dispatch_test.cpp
index 80f3c7e4..c74f9a6f 100644
--- a/test/TextToBinary.SubgroupDispatch.cpp
+++ b/test/text_to_binary.subgroup_dispatch_test.cpp
@@ -15,9 +15,9 @@
 // Assembler tests for instructions in the "Barrier Instructions" section
 // of the SPIR-V spec.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 #include "gmock/gmock.h"
 
 namespace {
diff --git a/test/TextToBinary.TypeDeclaration.cpp b/test/text_to_binary.type_declaration_test.cpp
similarity index 99%
rename from test/TextToBinary.TypeDeclaration.cpp
rename to test/text_to_binary.type_declaration_test.cpp
index 4e548fbe..cc2b1656 100644
--- a/test/TextToBinary.TypeDeclaration.cpp
+++ b/test/text_to_binary.type_declaration_test.cpp
@@ -15,9 +15,9 @@
 // Assembler tests for instructions in the "Type-Declaration" section of the
 // SPIR-V spec.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 #include "gmock/gmock.h"
 
 namespace {
diff --git a/test/TextToBinary.cpp b/test/text_to_binary_test.cpp
similarity index 99%
rename from test/TextToBinary.cpp
rename to test/text_to_binary_test.cpp
index 4db3ed23..ff7e04e5 100644
--- a/test/TextToBinary.cpp
+++ b/test/text_to_binary_test.cpp
@@ -19,8 +19,8 @@
 
 #include "gmock/gmock.h"
 
-#include "TestFixture.h"
-#include "UnitSPIRV.h"
+#include "test_fixture.h"
+#include "unit_spirv.h"
 #include "source/spirv_constant.h"
 #include "source/util/bitutils.h"
 #include "source/util/hex_float.h"
diff --git a/test/TextWordGet.cpp b/test/text_word_get_test.cpp
similarity index 99%
rename from test/TextWordGet.cpp
rename to test/text_word_get_test.cpp
index 3b1e9967..dccc7133 100644
--- a/test/TextWordGet.cpp
+++ b/test/text_word_get_test.cpp
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 namespace {
 
diff --git a/test/UnitSPIRV.cpp b/test/unit_spirv.cpp
similarity index 97%
rename from test/UnitSPIRV.cpp
rename to test/unit_spirv.cpp
index f89df6e1..c2a770a8 100644
--- a/test/UnitSPIRV.cpp
+++ b/test/unit_spirv.cpp
@@ -12,10 +12,10 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 #include "gmock/gmock.h"
-#include "TestFixture.h"
+#include "test_fixture.h"
 
 namespace {
 
diff --git a/test/UnitSPIRV.h b/test/unit_spirv.h
similarity index 100%
rename from test/UnitSPIRV.h
rename to test/unit_spirv.h
diff --git a/test/val/CMakeLists.txt b/test/val/CMakeLists.txt
index 6518fca8..3b79367c 100644
--- a/test/val/CMakeLists.txt
+++ b/test/val/CMakeLists.txt
@@ -13,9 +13,9 @@
 # limitations under the License.
 
 set(VAL_TEST_COMMON_SRCS
-  ${CMAKE_CURRENT_SOURCE_DIR}/../TestFixture.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/../UnitSPIRV.h
-  ${CMAKE_CURRENT_SOURCE_DIR}/../UnitSPIRV.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/../test_fixture.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/../unit_spirv.h
+  ${CMAKE_CURRENT_SOURCE_DIR}/../unit_spirv.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/ValidateFixtures.h
   ${CMAKE_CURRENT_SOURCE_DIR}/ValidateFixtures.cpp
 )
diff --git a/test/val/Validate.CFG.cpp b/test/val/Validate.CFG.cpp
index 8fbb0ceb..d0461e3d 100644
--- a/test/val/Validate.CFG.cpp
+++ b/test/val/Validate.CFG.cpp
@@ -25,8 +25,8 @@
 
 #include "gmock/gmock.h"
 
-#include "TestFixture.h"
-#include "UnitSPIRV.h"
+#include "test_fixture.h"
+#include "unit_spirv.h"
 #include "ValidateFixtures.h"
 #include "source/diagnostic.h"
 #include "source/validate.h"
diff --git a/test/val/Validate.Capability.cpp b/test/val/Validate.Capability.cpp
index 5af65d7e..494a553b 100644
--- a/test/val/Validate.Capability.cpp
+++ b/test/val/Validate.Capability.cpp
@@ -15,8 +15,8 @@
 // Validation tests for Logical Layout
 
 #include <gmock/gmock.h>
-#include "TestFixture.h"
-#include "UnitSPIRV.h"
+#include "test_fixture.h"
+#include "unit_spirv.h"
 #include "ValidateFixtures.h"
 #include "source/assembly_grammar.h"
 
diff --git a/test/val/Validate.Layout.cpp b/test/val/Validate.Layout.cpp
index a1256ab9..6d5c8176 100644
--- a/test/val/Validate.Layout.cpp
+++ b/test/val/Validate.Layout.cpp
@@ -21,7 +21,7 @@
 
 #include "gmock/gmock.h"
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 #include "ValidateFixtures.h"
 #include "source/diagnostic.h"
 
diff --git a/test/val/Validate.SSA.cpp b/test/val/Validate.SSA.cpp
index 06f56911..2386b151 100644
--- a/test/val/Validate.SSA.cpp
+++ b/test/val/Validate.SSA.cpp
@@ -14,7 +14,7 @@
 
 // Validation tests for SSA
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 #include "ValidateFixtures.h"
 #include "gmock/gmock.h"
 
diff --git a/test/val/ValidateFixtures.cpp b/test/val/ValidateFixtures.cpp
index 7d0d2062..e10a6a66 100644
--- a/test/val/ValidateFixtures.cpp
+++ b/test/val/ValidateFixtures.cpp
@@ -20,7 +20,7 @@
 #include <tuple>
 #include <utility>
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 
 namespace spvtest {
 
diff --git a/test/val/ValidateFixtures.h b/test/val/ValidateFixtures.h
index 3ec6627d..faab41a7 100644
--- a/test/val/ValidateFixtures.h
+++ b/test/val/ValidateFixtures.h
@@ -17,7 +17,7 @@
 #ifndef LIBSPIRV_TEST_VALIDATE_FIXTURES_H_
 #define LIBSPIRV_TEST_VALIDATE_FIXTURES_H_
 
-#include "UnitSPIRV.h"
+#include "unit_spirv.h"
 
 namespace spvtest {
 
diff --git a/test/val/ValidateID.cpp b/test/val/ValidateID.cpp
index 727aa951..8a91bc98 100644
--- a/test/val/ValidateID.cpp
+++ b/test/val/ValidateID.cpp
@@ -15,7 +15,7 @@
 #include <sstream>
 #include <string>
 
-#include "TestFixture.h"
+#include "test_fixture.h"
 
 // NOTE: The tests in this file are ONLY testing ID usage, there for the input
 // SPIR-V does not follow the logical layout rules from the spec in all cases in