diff --git a/snippets/csharp/System/IDisposable/Overview/base1.cs b/snippets/csharp/System/IDisposable/Overview/base1.cs
index 12c4d02c721..d36a0356ad8 100644
--- a/snippets/csharp/System/IDisposable/Overview/base1.cs
+++ b/snippets/csharp/System/IDisposable/Overview/base1.cs
@@ -1,14 +1,14 @@
 // <Snippet3>
-using Microsoft.Win32.SafeHandles;
 using System;
+using System.IO;
 using System.Runtime.InteropServices;
 
 class BaseClass1 : IDisposable
 {
     // Flag: Has Dispose already been called?
     bool disposed = false;
-    // Instantiate a SafeHandle instance.
-    SafeHandle handle = new SafeFileHandle(IntPtr.Zero, true);
+    // Instantiate a FileStream instance.
+    FileStream fs = new FileStream("test.txt", FileMode.OpenOrCreate);
 
     // Public implementation of Dispose pattern callable by consumers.
     public void Dispose()
@@ -25,7 +25,7 @@ protected virtual void Dispose(bool disposing)
 
         if (disposing)
         {
-            handle.Dispose();
+            fs.Dispose();
             // Free any other managed objects here.
             //
         }
diff --git a/snippets/csharp/System/IDisposable/Overview/derived1.cs b/snippets/csharp/System/IDisposable/Overview/derived1.cs
index 96368903bef..a31a5b55085 100644
--- a/snippets/csharp/System/IDisposable/Overview/derived1.cs
+++ b/snippets/csharp/System/IDisposable/Overview/derived1.cs
@@ -1,14 +1,14 @@
 // <Snippet4>
-using Microsoft.Win32.SafeHandles;
 using System;
+using System.IO;
 using System.Runtime.InteropServices;
 
 class MyDerivedClass : MyBaseClass
 {
     // Flag: Has Dispose already been called?
     bool disposed = false;
-    // Instantiate a SafeHandle instance.
-    SafeHandle handle = new SafeFileHandle(IntPtr.Zero, true);
+    // Instantiate a FileStream instance.
+    FileStream fs = new FileStream("test.txt", FileMode.OpenOrCreate);
 
     // Protected implementation of Dispose pattern.
     protected override void Dispose(bool disposing)
@@ -18,7 +18,7 @@ protected override void Dispose(bool disposing)
 
         if (disposing)
         {
-            handle.Dispose();
+            fs.Dispose();
             // Free any other managed objects here.
             //
         }
diff --git a/snippets/fsharp/System/IDisposable/Overview/base1.fs b/snippets/fsharp/System/IDisposable/Overview/base1.fs
index 11a1b13200c..00a9713d498 100644
--- a/snippets/fsharp/System/IDisposable/Overview/base1.fs
+++ b/snippets/fsharp/System/IDisposable/Overview/base1.fs
@@ -1,15 +1,15 @@
 module base1
 
 // <Snippet3>
-open Microsoft.Win32.SafeHandles
 open System
+open System.IO
 
 type BaseClass1() =
     // Flag: Has Dispose already been called?
     let mutable disposed = false
 
-    // Instantiate a SafeHandle instance.
-    let handle = new SafeFileHandle(IntPtr.Zero, true)
+    // Instantiate a FileStream instance.
+    let fs = new FileStream("test.txt", FileMode.OpenOrCreate)
 
     interface IDisposable with
         // Public implementation of Dispose pattern callable by consumers.
@@ -22,8 +22,8 @@ type BaseClass1() =
     override _.Dispose(disposing) =
         if not disposed then
             if disposing then
-                handle.Dispose()
+                fs.Dispose()
                 // Free any other managed objects here.
             disposed <- true
 
-// </Snippet3>
\ No newline at end of file
+// </Snippet3>
diff --git a/snippets/fsharp/System/IDisposable/Overview/derived1.fs b/snippets/fsharp/System/IDisposable/Overview/derived1.fs
index 352c5a9c439..c3ecd78d5fa 100644
--- a/snippets/fsharp/System/IDisposable/Overview/derived1.fs
+++ b/snippets/fsharp/System/IDisposable/Overview/derived1.fs
@@ -1,5 +1,6 @@
 module derived1
 open System
+open System.IO
 
 type MyBaseClass() =
     // Flag: Has Dispose already been called?
@@ -30,18 +31,18 @@ type MyDerivedClass() =
     
     // Flag: Has Dispose already been called?
     let mutable disposed = false
-    // Instantiate a SafeHandle instance.
-    let handle = new SafeFileHandle(IntPtr.Zero, true)
+    // Instantiate a FileStream instance.
+    let fs = new FileStream("test.txt", FileMode.OpenOrCreate)
 
     // Implementation of Dispose pattern.
     override _.Dispose(disposing) =
         if not disposed then
             if disposing then
-                handle.Dispose()
+                fs.Dispose()
                 // Free any other managed objects here.
 
             // Free any unmanaged objects here.
             disposed <- true
             // Call base class implementation.
             base.Dispose disposing
-// </Snippet4>
\ No newline at end of file
+// </Snippet4>
diff --git a/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/IDisposableSnippets.vbproj b/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/IDisposableSnippets.vbproj
new file mode 100644
index 00000000000..dbc151713b6
--- /dev/null
+++ b/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/IDisposableSnippets.vbproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>net6.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/base1.vb b/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/base1.vb
index 2a0a882453d..f0e4b14ce75 100644
--- a/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/base1.vb
+++ b/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/base1.vb
@@ -2,14 +2,14 @@
 Option Strict On
 
 ' <Snippet3>
-Imports Microsoft.Win32.SafeHandles
+Imports System.IO
 Imports System.Runtime.InteropServices
 
-Class BaseClass : Implements IDisposable
+Class BaseClass1 : Implements IDisposable
    ' Flag: Has Dispose already been called?
    Dim disposed As Boolean = False
-   ' Instantiate a SafeHandle instance.
-   Dim handle As SafeHandle = New SafeFileHandle(IntPtr.Zero, True)
+   ' Instantiate a FileStream instance.
+   Dim fs As FileStream = New FileStream("test.txt", FileMode.OpenOrCreate)
 
    ' Public implementation of Dispose pattern callable by consumers.
    Public Sub Dispose() _
@@ -23,7 +23,7 @@ Class BaseClass : Implements IDisposable
       If disposed Then Return
 
       If disposing Then
-         handle.Dispose()
+         fs.Dispose()
          ' Free any other managed objects here.
          '
       End If
diff --git a/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/calling2.vb b/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/calling2.vb
index d1e788de6ca..75957b80d32 100644
--- a/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/calling2.vb
+++ b/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/calling2.vb
@@ -5,7 +5,7 @@ Option Strict On
 Imports System.IO
 Imports System.Text.RegularExpressions
 
-Public Class WordCount
+Public Class WordCount2
    Private filename As String
    Private nWords As Integer
    Private pattern As String = "\b\w+\b" 
@@ -47,9 +47,9 @@ Public Class WordCount
 End Class
 ' </Snippet2>
 
-Public Module Example
+Public Module Example2
    Public Sub Main()
-      Dim wc As New WordCount("C:\users\ronpet\documents\Fr_Mike_Mass.txt")
+      Dim wc As New WordCount2("C:\users\ronpet\documents\Fr_Mike_Mass.txt")
       Console.WriteLine("File {0} ({1}) has {2} words", 
                         wc.Name, wc.FullName, wc.Count)
    End Sub
diff --git a/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/derived1.vb b/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/derived1.vb
index d907941b029..1bf423286cd 100644
--- a/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/derived1.vb
+++ b/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/derived1.vb
@@ -2,21 +2,21 @@
 Option Strict On
 
 ' <Snippet4>
-Imports Microsoft.Win32.SafeHandles
+Imports System.IO
 Imports System.Runtime.InteropServices
 
-Class DerivedClass : Inherits BaseClass
+Class DerivedClass2 : Inherits BaseClass2
    ' Flag: Has Dispose already been called?
    Dim disposed As Boolean = False
-   ' Instantiate a SafeHandle instance.
-   Dim handle As SafeHandle = New SafeFileHandle(IntPtr.Zero, True)
+   ' Instantiate a FileStream instance.
+   Dim fs As FileStream = New FileStream("test.txt", FileMode.OpenOrCreate)
 
    ' Protected implementation of Dispose pattern.
    Protected Overrides Sub Dispose(disposing As Boolean)
       If disposed Then Return
 
       If disposing Then
-         handle.Dispose()
+         fs.Dispose()
          ' Free any other managed objects here.
          '
       End If
@@ -31,7 +31,7 @@ Class DerivedClass : Inherits BaseClass
 End Class
 ' </Snippet4>
 
-Class BaseClass : Implements IDisposable
+Class BaseClass2 : Implements IDisposable
    ' Flag: Has Dispose already been called?
    Dim disposed As Boolean = False
 
diff --git a/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/derived2.vb b/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/derived2.vb
index 7ecf14c85b6..51ab6a3f872 100644
--- a/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/derived2.vb
+++ b/snippets/visualbasic/VS_Snippets_CLR_System/system.idisposable/vb/derived2.vb
@@ -2,7 +2,7 @@
 Option Strict On
 
 ' <Snippet6>
-Class DerivedClass : Inherits BaseClass
+Class DerivedClass : Inherits BaseClass3
    ' Flag: Has Dispose already been called?
    Dim disposed As Boolean = False
 
@@ -29,7 +29,7 @@ Class DerivedClass : Inherits BaseClass
 End Class
 ' </Snippet6>
 
-Class BaseClass : Implements IDisposable
+Class BaseClass3 : Implements IDisposable
    ' Flag: Has Dispose already been called?
    Dim disposed As Boolean = False