diff --git a/Sources/HgiMetal/include/HgiMetal/graphicsCmds.h b/Sources/HgiMetal/include/HgiMetal/graphicsCmds.h
index 5855a341e..595ed216b 100644
--- a/Sources/HgiMetal/include/HgiMetal/graphicsCmds.h
+++ b/Sources/HgiMetal/include/HgiMetal/graphicsCmds.h
@@ -126,8 +126,8 @@ class HgiMetalGraphicsCmds final : public HgiGraphicsCmds {
 
     void ResetCachedEncoderState();
 
-    MTLViewport viewport;
-    MTLScissorRect scissorRect;
+    MTL::Viewport viewport;
+    MTL::ScissorRect scissorRect;
 
     HgiMetalResourceBindings *resourceBindings;
     HgiMetalGraphicsPipeline *graphicsPipeline;
@@ -136,7 +136,7 @@ class HgiMetalGraphicsCmds final : public HgiGraphicsCmds {
   } _CachedEncState;
 
   HgiMetal *_hgi;
-  MTLRenderPassDescriptor *_renderPassDescriptor;
+  MTL::RenderPassDescriptor *_renderPassDescriptor;
   MTL::ParallelRenderCommandEncoder* _parallelEncoder;
   std::vector<MTL::RenderCommandEncoder*> _encoders;
   MTL::Buffer* _argumentBuffer;
diff --git a/Sources/HgiMetal/include/HgiMetal/graphicsPipeline.h b/Sources/HgiMetal/include/HgiMetal/graphicsPipeline.h
index 17ce341e9..e2f3de816 100644
--- a/Sources/HgiMetal/include/HgiMetal/graphicsPipeline.h
+++ b/Sources/HgiMetal/include/HgiMetal/graphicsPipeline.h
@@ -42,7 +42,7 @@ class HgiMetalGraphicsPipeline final : public HgiGraphicsPipeline {
   void _CreateDepthStencilState(HgiMetal *hgi);
   void _CreateRenderPipelineState(HgiMetal *hgi);
 
-  MTLVertexDescriptor *_vertexDescriptor;
+  MTL::VertexDescriptor *_vertexDescriptor;
   MTL::DepthStencilState* _depthStencilState;
   MTL::RenderPipelineState* _renderPipelineState;
   MTL::Buffer* _constantTessFactors;
diff --git a/Sources/HgiMetal/include/HgiMetal/shaderProgram.h b/Sources/HgiMetal/include/HgiMetal/shaderProgram.h
index ec6ff9cb1..09fc37642 100644
--- a/Sources/HgiMetal/include/HgiMetal/shaderProgram.h
+++ b/Sources/HgiMetal/include/HgiMetal/shaderProgram.h
@@ -26,7 +26,7 @@ PXR_NAMESPACE_OPEN_SCOPE
 class HgiMetalShaderProgram final : public HgiShaderProgram {
  public:
   HGIMETAL_API
-  ~HgiMetalShaderProgram() override;
+  ~HgiMetalShaderProgram() noexcept override;
 
   HGIMETAL_API
   bool IsValid() const override;
diff --git a/Sources/HgiMetal/shaderFunction.cpp b/Sources/HgiMetal/shaderFunction.cpp
index d8afc0195..3f5b2eb6e 100644
--- a/Sources/HgiMetal/shaderFunction.cpp
+++ b/Sources/HgiMetal/shaderFunction.cpp
@@ -34,7 +34,7 @@
 
 PXR_NAMESPACE_OPEN_SCOPE
 
-HgiMetalShaderFunction::HgiMetalShaderFunctionHgiMetalShaderFunction(
+HgiMetalShaderFunction::HgiMetalShaderFunction(
     HgiMetal *hgi, HgiShaderFunctionDesc const &desc)
     : HgiShaderFunction(desc), _shaderId(nil)
 {