diff --git a/include/circt/Dialect/SV/SVTypeDecl.td b/include/circt/Dialect/SV/SVTypeDecl.td
index 599d169bc9..01402b0539 100644
--- a/include/circt/Dialect/SV/SVTypeDecl.td
+++ b/include/circt/Dialect/SV/SVTypeDecl.td
@@ -212,7 +212,8 @@ def ModportType : SVType<"Modport"> {
 
 def InterfaceInstanceOp : SVOp<"interface.instance", [
       HasCustomSSAName,
-      DeclareOpInterfaceMethods<InnerSymbol, ["getTargetResultIndex"]>
+      DeclareOpInterfaceMethods<InnerSymbol, ["getTargetResultIndex"]>,
+      DeclareOpInterfaceMethods<SymbolUserOpInterface>
     ]> {
   let summary = "Instantiate an interface";
   let description = [{
@@ -259,7 +260,9 @@ def InterfaceInstanceOp : SVOp<"interface.instance", [
   }];
 }
 
-def GetModportOp: SVOp<"modport.get", [Pure]> {
+def GetModportOp: SVOp<"modport.get", [Pure,
+      DeclareOpInterfaceMethods<SymbolUserOpInterface>
+    ]> {
   let summary = "Get a modport out of an interface instance";
   let description = [{
     Use this to extract a modport view to an instantiated interface. For
@@ -278,8 +281,6 @@ def GetModportOp: SVOp<"modport.get", [Pure]> {
   let assemblyFormat =
     "$iface $field attr-dict `:` qualified(type($iface)) `->` qualified(type($result))";
 
-  let hasVerifier = 1;
-
   let builders = [
     OpBuilder<(ins "Value":$value, "::llvm::StringRef":$field)>
   ];
diff --git a/lib/Dialect/SV/SVOps.cpp b/lib/Dialect/SV/SVOps.cpp
index 6402c6b507..8e91761842 100644
--- a/lib/Dialect/SV/SVOps.cpp
+++ b/lib/Dialect/SV/SVOps.cpp
@@ -1456,14 +1456,18 @@ void InterfaceInstanceOp::getAsmResultNames(OpAsmSetValueNameFn setNameFn) {
 LogicalResult InterfaceInstanceOp::verify() {
   if (getName().empty())
     return emitOpError("requires non-empty name");
+  return success();
+}
 
+LogicalResult
+InterfaceInstanceOp::verifySymbolUses(SymbolTableCollection &symbolTable) {
   auto *symtable = SymbolTable::getNearestSymbolTable(*this);
   if (!symtable)
     return emitError("sv.interface.instance must exist within a region "
                      "which has a symbol table.");
   auto ifaceTy = getType();
-  auto referencedOp =
-      SymbolTable::lookupSymbolIn(symtable, ifaceTy.getInterface());
+  auto *referencedOp =
+      symbolTable.lookupSymbolIn(symtable, ifaceTy.getInterface());
   if (!referencedOp)
     return emitError("Symbol not found: ") << ifaceTy.getInterface() << ".";
   if (!isa<InterfaceOp>(referencedOp))
@@ -1474,14 +1478,16 @@ LogicalResult InterfaceInstanceOp::verify() {
 
 /// Ensure that the symbol being instantiated exists and is an
 /// InterfaceModportOp.
-LogicalResult GetModportOp::verify() {
+LogicalResult
+GetModportOp::verifySymbolUses(SymbolTableCollection &symbolTable) {
   auto *symtable = SymbolTable::getNearestSymbolTable(*this);
   if (!symtable)
     return emitError("sv.interface.instance must exist within a region "
                      "which has a symbol table.");
+
   auto ifaceTy = getType();
-  auto referencedOp =
-      SymbolTable::lookupSymbolIn(symtable, ifaceTy.getModport());
+  auto *referencedOp =
+      symbolTable.lookupSymbolIn(symtable, ifaceTy.getModport());
   if (!referencedOp)
     return emitError("Symbol not found: ") << ifaceTy.getModport() << ".";
   if (!isa<InterfaceModportOp>(referencedOp))