diff --git a/lib/mayaUsd/fileio/translators/CMakeLists.txt b/lib/mayaUsd/fileio/translators/CMakeLists.txt
index 487effecd1..a9678e94a8 100644
--- a/lib/mayaUsd/fileio/translators/CMakeLists.txt
+++ b/lib/mayaUsd/fileio/translators/CMakeLists.txt
@@ -15,11 +15,11 @@ target_sources(${PROJECT_NAME}
         translatorNurbsPatch.cpp
         translatorPrim.cpp
         translatorRfMLight.cpp
-        translatorRfMLight_deprecated.cpp
+        translatorRfMLightDeprecated.cpp
         translatorSkel.cpp
         translatorUtil.cpp
         translatorXformable.cpp
-        translatorXformable_decompose.cpp
+        translatorXformableDecompose.cpp
 )
 
 set(HEADERS
diff --git a/lib/mayaUsd/fileio/translators/translatorRfMLight_deprecated.cpp b/lib/mayaUsd/fileio/translators/translatorRfMLightDeprecated.cpp
similarity index 100%
rename from lib/mayaUsd/fileio/translators/translatorRfMLight_deprecated.cpp
rename to lib/mayaUsd/fileio/translators/translatorRfMLightDeprecated.cpp
diff --git a/lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp b/lib/mayaUsd/fileio/translators/translatorXformableDecompose.cpp
similarity index 100%
rename from lib/mayaUsd/fileio/translators/translatorXformable_decompose.cpp
rename to lib/mayaUsd/fileio/translators/translatorXformableDecompose.cpp
diff --git a/lib/mayaUsd/render/px_vp20/CMakeLists.txt b/lib/mayaUsd/render/px_vp20/CMakeLists.txt
index ba6fb0d50b..31377a94f9 100644
--- a/lib/mayaUsd/render/px_vp20/CMakeLists.txt
+++ b/lib/mayaUsd/render/px_vp20/CMakeLists.txt
@@ -5,13 +5,13 @@ target_sources(${PROJECT_NAME}
     PRIVATE
         glslProgram.cpp
         utils.cpp
-        utils_legacy.cpp
+        utilsLegacy.cpp
 )
 
 set(HEADERS
     glslProgram.h
     utils.h
-    utils_legacy.h
+    utilsLegacy.h
 )
 
 # -----------------------------------------------------------------------------
diff --git a/lib/mayaUsd/render/px_vp20/utils_legacy.cpp b/lib/mayaUsd/render/px_vp20/utilsLegacy.cpp
similarity index 98%
rename from lib/mayaUsd/render/px_vp20/utils_legacy.cpp
rename to lib/mayaUsd/render/px_vp20/utilsLegacy.cpp
index dd940db9aa..30f391c5a1 100644
--- a/lib/mayaUsd/render/px_vp20/utils_legacy.cpp
+++ b/lib/mayaUsd/render/px_vp20/utilsLegacy.cpp
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "utils_legacy.h"
+#include "utilsLegacy.h"
 
 #include <pxr/base/gf/matrix4d.h>
 #include <pxr/pxr.h>
diff --git a/lib/mayaUsd/render/px_vp20/utils_legacy.h b/lib/mayaUsd/render/px_vp20/utilsLegacy.h
similarity index 98%
rename from lib/mayaUsd/render/px_vp20/utils_legacy.h
rename to lib/mayaUsd/render/px_vp20/utilsLegacy.h
index 233dd67c82..6e9215fe4e 100644
--- a/lib/mayaUsd/render/px_vp20/utils_legacy.h
+++ b/lib/mayaUsd/render/px_vp20/utilsLegacy.h
@@ -16,8 +16,6 @@
 #ifndef PXVP20_UTILS_LEGACY_H
 #define PXVP20_UTILS_LEGACY_H
 
-/// \file px_vp20/utils_legacy.h
-
 #include <mayaUsd/base/api.h>
 
 #include <pxr/base/gf/matrix4d.h>
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp
index 949cc637d8..2dc1b3f45f 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/batchRenderer.cpp
@@ -19,7 +19,7 @@
 #include "batchRenderer.h"
 
 #include <mayaUsd/render/px_vp20/utils.h>
-#include <mayaUsd/render/px_vp20/utils_legacy.h>
+#include <mayaUsd/render/px_vp20/utilsLegacy.h>
 #include <mayaUsd/render/pxrUsdMayaGL/debugCodes.h>
 #include <mayaUsd/render/pxrUsdMayaGL/userData.h>
 
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp
index 136c01c75b..80e8595d43 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/proxyShapeUI.cpp
@@ -16,7 +16,7 @@
 #include "proxyShapeUI.h"
 
 #include <mayaUsd/nodes/proxyShapeBase.h>
-#include <mayaUsd/render/px_vp20/utils_legacy.h>
+#include <mayaUsd/render/px_vp20/utilsLegacy.h>
 #include <mayaUsd/render/pxrUsdMayaGL/batchRenderer.h>
 #include <mayaUsd/render/pxrUsdMayaGL/renderParams.h>
 #include <mayaUsd/render/pxrUsdMayaGL/usdProxyShapeAdapter.h>
diff --git a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp
index fb862db132..bdb94782a4 100644
--- a/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp
+++ b/lib/mayaUsd/render/pxrUsdMayaGL/shapeAdapter.cpp
@@ -16,7 +16,7 @@
 #include "shapeAdapter.h"
 
 #include <mayaUsd/base/api.h>
-#include <mayaUsd/render/px_vp20/utils_legacy.h>
+#include <mayaUsd/render/px_vp20/utilsLegacy.h>
 #include <mayaUsd/render/pxrUsdMayaGL/batchRenderer.h>
 #include <mayaUsd/render/pxrUsdMayaGL/debugCodes.h>
 #include <mayaUsd/render/pxrUsdMayaGL/renderParams.h>
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/CMakeLists.txt b/lib/mayaUsd/render/vp2RenderDelegate/CMakeLists.txt
index ab019a0506..e2bc2d6ced 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/CMakeLists.txt
+++ b/lib/mayaUsd/render/vp2RenderDelegate/CMakeLists.txt
@@ -6,7 +6,7 @@ target_sources(${PROJECT_NAME}
         basisCurves.cpp
         bboxGeom.cpp
         debugCodes.cpp
-        draw_item.cpp
+        drawItem.cpp
         extComputation.cpp
         instancer.cpp
         material.cpp
@@ -16,8 +16,8 @@ target_sources(${PROJECT_NAME}
         points.cpp
         proxyRenderDelegate.cpp
         colorManagementPreferences.cpp
-        render_delegate.cpp
-        render_param.cpp
+        renderDelegate.cpp
+        renderParam.cpp
         sampler.cpp
         shader.cpp
         tokens.cpp
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp b/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp
index 7019fbd5d9..48b6d205ef 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/basisCurves.cpp
@@ -18,10 +18,10 @@
 
 #include "bboxGeom.h"
 #include "debugCodes.h"
-#include "draw_item.h"
+#include "drawItem.h"
 #include "instancer.h"
 #include "material.h"
-#include "render_delegate.h"
+#include "renderDelegate.h"
 #include "tokens.h"
 
 #include <pxr/base/gf/matrix4d.h>
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/draw_item.cpp b/lib/mayaUsd/render/vp2RenderDelegate/drawItem.cpp
similarity index 98%
rename from lib/mayaUsd/render/vp2RenderDelegate/draw_item.cpp
rename to lib/mayaUsd/render/vp2RenderDelegate/drawItem.cpp
index 0c688eb1a8..383c859f11 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/draw_item.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/drawItem.cpp
@@ -13,9 +13,9 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "draw_item.h"
+#include "drawItem.h"
 
-#include "render_delegate.h"
+#include "renderDelegate.h"
 
 #include <pxr/imaging/hd/mesh.h>
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/draw_item.h b/lib/mayaUsd/render/vp2RenderDelegate/drawItem.h
similarity index 100%
rename from lib/mayaUsd/render/vp2RenderDelegate/draw_item.h
rename to lib/mayaUsd/render/vp2RenderDelegate/drawItem.h
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/material.cpp b/lib/mayaUsd/render/vp2RenderDelegate/material.cpp
index 4e332e70ed..d61be10036 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/material.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/material.cpp
@@ -18,7 +18,7 @@
 #include "debugCodes.h"
 #include "pxr/usd/sdr/registry.h"
 #include "pxr/usd/sdr/shaderNode.h"
-#include "render_delegate.h"
+#include "renderDelegate.h"
 #include "tokens.h"
 
 #include <mayaUsd/base/tokens.h>
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.cpp b/lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.cpp
index 43cdef921b..2b2d2d90e3 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.cpp
@@ -18,7 +18,7 @@
 
 #include "bboxGeom.h"
 #include "material.h"
-#include "render_delegate.h"
+#include "renderDelegate.h"
 #include "tokens.h"
 
 #include <pxr/usdImaging/usdImaging/delegate.h>
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.h b/lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.h
index bac59862d9..fd0bd57c6c 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/mayaPrimCommon.h
@@ -16,7 +16,7 @@
 #ifndef HD_VP2_MAYA_PRIM_COMMON
 #define HD_VP2_MAYA_PRIM_COMMON
 
-#include "draw_item.h"
+#include "drawItem.h"
 #include "pxr/imaging/hd/changeTracker.h"
 #include "pxr/imaging/hd/types.h"
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp b/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp
index bb3cbd8384..3b6465302d 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/mesh.cpp
@@ -19,7 +19,7 @@
 #include "debugCodes.h"
 #include "instancer.h"
 #include "material.h"
-#include "render_delegate.h"
+#include "renderDelegate.h"
 #include "tokens.h"
 
 #include <mayaUsd/base/tokens.h>
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/mesh.h b/lib/mayaUsd/render/vp2RenderDelegate/mesh.h
index 4c619cf5c7..aa83ec1f28 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/mesh.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/mesh.h
@@ -16,7 +16,7 @@
 #ifndef HD_VP2_MESH
 #define HD_VP2_MESH
 
-#include "draw_item.h"
+#include "drawItem.h"
 #include "mayaPrimCommon.h"
 #include "meshViewportCompute.h"
 #include "primvarInfo.h"
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/meshViewportCompute.cpp b/lib/mayaUsd/render/vp2RenderDelegate/meshViewportCompute.cpp
index 1a6dabdbdb..b34cb0d717 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/meshViewportCompute.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/meshViewportCompute.cpp
@@ -19,7 +19,7 @@
 #ifdef HDVP2_ENABLE_GPU_COMPUTE
 
 #include "mesh.h"
-#include "render_delegate.h"
+#include "renderDelegate.h"
 
 #include <mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h>
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/points.cpp b/lib/mayaUsd/render/vp2RenderDelegate/points.cpp
index 239912e130..94466afd4f 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/points.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/points.cpp
@@ -18,10 +18,10 @@
 
 #include "bboxGeom.h"
 #include "debugCodes.h"
-#include "draw_item.h"
+#include "drawItem.h"
 #include "instancer.h"
 #include "material.h"
-#include "render_delegate.h"
+#include "renderDelegate.h"
 #include "tokens.h"
 
 #include <pxr/base/gf/matrix4d.h>
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/primvarInfo.h b/lib/mayaUsd/render/vp2RenderDelegate/primvarInfo.h
index 21d5e25d06..0c646e4f5e 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/primvarInfo.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/primvarInfo.h
@@ -16,7 +16,7 @@
 #ifndef HD_VP2_PRIMVARINFO
 #define HD_VP2_PRIMVARINFO
 
-#include "draw_item.h"
+#include "drawItem.h"
 #include "meshViewportCompute.h"
 
 #include <mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.h>
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp
index 30fd57bc1c..da5a6bceb3 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/proxyRenderDelegate.cpp
@@ -15,10 +15,10 @@
 //
 #include "proxyRenderDelegate.h"
 
-#include "draw_item.h"
+#include "drawItem.h"
 #include "material.h"
 #include "mayaPrimCommon.h"
-#include "render_delegate.h"
+#include "renderDelegate.h"
 #include "tokens.h"
 
 #include <mayaUsd/base/tokens.h>
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.cpp b/lib/mayaUsd/render/vp2RenderDelegate/renderDelegate.cpp
similarity index 99%
rename from lib/mayaUsd/render/vp2RenderDelegate/render_delegate.cpp
rename to lib/mayaUsd/render/vp2RenderDelegate/renderDelegate.cpp
index 3dc5f9124c..8072b87eec 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/renderDelegate.cpp
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "render_delegate.h"
+#include "renderDelegate.h"
 
 #include "basisCurves.h"
 #include "bboxGeom.h"
@@ -22,7 +22,7 @@
 #include "material.h"
 #include "mesh.h"
 #include "points.h"
-#include "render_pass.h"
+#include "renderPass.h"
 #include "tokens.h"
 
 #include <mayaUsd/render/vp2ShaderFragments/shaderFragments.h>
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h b/lib/mayaUsd/render/vp2RenderDelegate/renderDelegate.h
similarity index 99%
rename from lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h
rename to lib/mayaUsd/render/vp2RenderDelegate/renderDelegate.h
index 92a31ded69..1007504f82 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/render_delegate.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/renderDelegate.h
@@ -16,8 +16,8 @@
 #ifndef HD_VP2_RENDER_DELEGATE
 #define HD_VP2_RENDER_DELEGATE
 
-#include "render_param.h"
-#include "resource_registry.h"
+#include "renderParam.h"
+#include "resourceRegistry.h"
 #include "shader.h"
 
 #include <pxr/imaging/hd/renderDelegate.h>
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_param.cpp b/lib/mayaUsd/render/vp2RenderDelegate/renderParam.cpp
similarity index 97%
rename from lib/mayaUsd/render/vp2RenderDelegate/render_param.cpp
rename to lib/mayaUsd/render/vp2RenderDelegate/renderParam.cpp
index ccc0687f6a..180b543fff 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/render_param.cpp
+++ b/lib/mayaUsd/render/vp2RenderDelegate/renderParam.cpp
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
-#include "render_param.h"
+#include "renderParam.h"
 
 #include <maya/MProfiler.h>
 
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_param.h b/lib/mayaUsd/render/vp2RenderDelegate/renderParam.h
similarity index 100%
rename from lib/mayaUsd/render/vp2RenderDelegate/render_param.h
rename to lib/mayaUsd/render/vp2RenderDelegate/renderParam.h
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/render_pass.h b/lib/mayaUsd/render/vp2RenderDelegate/renderPass.h
similarity index 100%
rename from lib/mayaUsd/render/vp2RenderDelegate/render_pass.h
rename to lib/mayaUsd/render/vp2RenderDelegate/renderPass.h
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/resource_registry.h b/lib/mayaUsd/render/vp2RenderDelegate/resourceRegistry.h
similarity index 98%
rename from lib/mayaUsd/render/vp2RenderDelegate/resource_registry.h
rename to lib/mayaUsd/render/vp2RenderDelegate/resourceRegistry.h
index e0326d092c..f58e9957fd 100644
--- a/lib/mayaUsd/render/vp2RenderDelegate/resource_registry.h
+++ b/lib/mayaUsd/render/vp2RenderDelegate/resourceRegistry.h
@@ -16,7 +16,7 @@
 #ifndef HD_VP2_RESOURCE_REGISTRY
 #define HD_VP2_RESOURCE_REGISTRY
 
-#include "task_commit.h"
+#include "taskCommit.h"
 
 #include <tbb/concurrent_queue.h>
 #include <tbb/tbb_allocator.h>
diff --git a/lib/mayaUsd/render/vp2RenderDelegate/task_commit.h b/lib/mayaUsd/render/vp2RenderDelegate/taskCommit.h
similarity index 100%
rename from lib/mayaUsd/render/vp2RenderDelegate/task_commit.h
rename to lib/mayaUsd/render/vp2RenderDelegate/taskCommit.h
diff --git a/lib/usd/translators/CMakeLists.txt b/lib/usd/translators/CMakeLists.txt
index 9769788a77..3ab64769b5 100644
--- a/lib/usd/translators/CMakeLists.txt
+++ b/lib/usd/translators/CMakeLists.txt
@@ -21,14 +21,14 @@ target_sources(${TARGET_NAME}
         jointWriter.cpp
         lightReader.cpp
         lightRfMWriter.cpp
-        lightRfMWriter_PxrMeshLight.cpp
+        lightRfMWriterPxrMeshLight.cpp
         lightWriter.cpp
         locatorWriter.cpp
         materialReader.cpp
         mayaReferenceReader.cpp
         meshReader.cpp
         meshWriter.cpp
-        meshWriter_BlendShapes.cpp
+        meshWriterBlendShapes.cpp
         nurbsCurvesReader.cpp
         nurbsCurveWriter.cpp
         nurbsPatchReader.cpp
diff --git a/lib/usd/translators/lightRfMWriter.cpp b/lib/usd/translators/lightRfMWriter.cpp
index 35ac03b6d3..befda78667 100644
--- a/lib/usd/translators/lightRfMWriter.cpp
+++ b/lib/usd/translators/lightRfMWriter.cpp
@@ -54,7 +54,7 @@ PXRUSDMAYA_DEFINE_WRITER(PxrRectLight, args, context)
     return UsdMayaTranslatorRfMLight::Write(args, context);
 }
 
-// see lightRfMWriter_PxrMeshLight.cpp for PxrMeshLight.
+// see lightRfMWriterPxrMeshLight.cpp for PxrMeshLight.
 
 PXRUSDMAYA_DEFINE_WRITER(PxrSphereLight, args, context)
 {
diff --git a/lib/usd/translators/lightRfMWriter_PxrMeshLight.cpp b/lib/usd/translators/lightRfMWriterPxrMeshLight.cpp
similarity index 100%
rename from lib/usd/translators/lightRfMWriter_PxrMeshLight.cpp
rename to lib/usd/translators/lightRfMWriterPxrMeshLight.cpp
diff --git a/lib/usd/translators/meshWriter_BlendShapes.cpp b/lib/usd/translators/meshWriterBlendShapes.cpp
similarity index 100%
rename from lib/usd/translators/meshWriter_BlendShapes.cpp
rename to lib/usd/translators/meshWriterBlendShapes.cpp