diff --git a/flang/include/flang/Optimizer/CodeGen/CodeGen.h b/flang/include/flang/Optimizer/CodeGen/CodeGen.h
index 1708f8e4f6384..d7928974cfed2 100644
--- a/flang/include/flang/Optimizer/CodeGen/CodeGen.h
+++ b/flang/include/flang/Optimizer/CodeGen/CodeGen.h
@@ -38,12 +38,12 @@ std::unique_ptr<mlir::OperationPass<mlir::ModuleOp>> createFirTargetRewritePass(
 /// FIR to LLVM translation pass options.
 struct FIRToLLVMPassOptions {
   // Do not fail when type descriptors are not found when translating
-  // operations that uses them at the LLVM level like fir.embox. Instead,
+  // operations that use them at the LLVM level like fir.embox. Instead,
   // just use a null pointer.
   // This is useful to test translating programs manually written where a
   // frontend did not generate type descriptor data structures. However, note
-  // that this programs would crash at runtime if the derived type descriptors
-  // are required by the runtime, so this only an option to help debugging.
+  // that such programs would crash at runtime if the derived type descriptors
+  // are required by the runtime, so this is only an option to help debugging.
   bool ignoreMissingTypeDescriptors = false;
 };
 
diff --git a/flang/include/flang/Semantics/scope.h b/flang/include/flang/Semantics/scope.h
index cd03e66ce0e71..e83f89405f74e 100644
--- a/flang/include/flang/Semantics/scope.h
+++ b/flang/include/flang/Semantics/scope.h
@@ -104,7 +104,7 @@ class Scope {
   bool IsParameterizedDerivedTypeInstantiation() const {
     return kind_ == Kind::DerivedType && !symbol_;
   }
-  bool IsKindParameterizedDerivedType() const;
+  bool IsDerivedTypeWithKindParameter() const;
   Symbol *symbol() { return symbol_; }
   const Symbol *symbol() const { return symbol_; }
   SemanticsContext &context() const { return context_; }
diff --git a/flang/lib/Semantics/compute-offsets.cpp b/flang/lib/Semantics/compute-offsets.cpp
index 99f81940bbbee..ea3b70f7ef259 100644
--- a/flang/lib/Semantics/compute-offsets.cpp
+++ b/flang/lib/Semantics/compute-offsets.cpp
@@ -68,7 +68,7 @@ void ComputeOffsetsHelper::Compute(Scope &scope) {
   for (Scope &child : scope.children()) {
     ComputeOffsets(context_, child);
   }
-  if (scope.symbol() && scope.IsKindParameterizedDerivedType()) {
+  if (scope.symbol() && scope.IsDerivedTypeWithKindParameter()) {
     return; // only process instantiations of kind parameterized derived types
   }
   if (scope.alignment().has_value()) {
diff --git a/flang/lib/Semantics/runtime-type-info.cpp b/flang/lib/Semantics/runtime-type-info.cpp
index a744efc36b283..feda8da14c23e 100644
--- a/flang/lib/Semantics/runtime-type-info.cpp
+++ b/flang/lib/Semantics/runtime-type-info.cpp
@@ -352,7 +352,6 @@ static std::optional<std::string> GetSuffixIfTypeKindParameters(
                 *suffix += "."s + std::to_string(*instantiatedValue);
               } else {
                 suffix = "."s + std::to_string(*instantiatedValue);
-                ;
               }
             }
           }
@@ -369,7 +368,7 @@ const Symbol *RuntimeTableBuilder::DescribeType(Scope &dtScope) {
     return info;
   }
   const DerivedTypeSpec *derivedTypeSpec{dtScope.derivedTypeSpec()};
-  if (!derivedTypeSpec && !dtScope.IsKindParameterizedDerivedType() &&
+  if (!derivedTypeSpec && !dtScope.IsDerivedTypeWithKindParameter() &&
       dtScope.symbol()) {
     // This derived type was declared (obviously, there's a Scope) but never
     // used in this compilation (no instantiated DerivedTypeSpec points here).
@@ -433,7 +432,7 @@ const Symbol *RuntimeTableBuilder::DescribeType(Scope &dtScope) {
   AddValue(dtValues, derivedTypeSchema_, "name"s,
       SaveNameAsPointerTarget(scope, typeName));
   bool isPDTdefinitionWithKindParameters{
-      !derivedTypeSpec && dtScope.IsKindParameterizedDerivedType()};
+      !derivedTypeSpec && dtScope.IsDerivedTypeWithKindParameter()};
   if (!isPDTdefinitionWithKindParameters) {
     auto sizeInBytes{static_cast<common::ConstantSubscript>(dtScope.size())};
     if (auto alignment{dtScope.alignment().value_or(0)}) {
diff --git a/flang/lib/Semantics/scope.cpp b/flang/lib/Semantics/scope.cpp
index 30bf59e418cf1..5d483733b4419 100644
--- a/flang/lib/Semantics/scope.cpp
+++ b/flang/lib/Semantics/scope.cpp
@@ -374,12 +374,12 @@ bool Scope::IsParameterizedDerivedType() const {
   return false;
 }
 
-bool Scope::IsKindParameterizedDerivedType() const {
+bool Scope::IsDerivedTypeWithKindParameter() const {
   if (!IsDerivedType()) {
     return false;
   }
   if (const Scope * parent{GetDerivedTypeParent()}) {
-    if (parent->IsKindParameterizedDerivedType()) {
+    if (parent->IsDerivedTypeWithKindParameter()) {
       return true;
     }
   }