diff --git a/examples/accesslevel/accesslevel.go b/examples/accesslevel/accesslevel.go
index d28a7d66..fad940ee 100644
--- a/examples/accesslevel/accesslevel.go
+++ b/examples/accesslevel/accesslevel.go
@@ -29,7 +29,7 @@ func main() {
 	if err := c.Connect(ctx); err != nil {
 		log.Fatal(err)
 	}
-	defer c.CloseSessionWithContext(ctx)
+	defer c.CloseWithContext(ctx)
 
 	id, err := ua.ParseNodeID(*nodeID)
 	if err != nil {
diff --git a/examples/browse/browse.go b/examples/browse/browse.go
index 3e564a4e..68678650 100644
--- a/examples/browse/browse.go
+++ b/examples/browse/browse.go
@@ -178,7 +178,7 @@ func main() {
 	if err := c.Connect(ctx); err != nil {
 		log.Fatal(err)
 	}
-	defer c.CloseSessionWithContext(ctx)
+	defer c.CloseWithContext(ctx)
 
 	id, err := ua.ParseNodeID(*nodeID)
 	if err != nil {
diff --git a/examples/crypto/crypto.go b/examples/crypto/crypto.go
index f8029f31..9a48ce7b 100644
--- a/examples/crypto/crypto.go
+++ b/examples/crypto/crypto.go
@@ -65,7 +65,7 @@ func main() {
 	if err := c.Connect(ctx); err != nil {
 		log.Fatal(err)
 	}
-	defer c.CloseSessionWithContext(ctx)
+	defer c.CloseWithContext(ctx)
 
 	// Use our connection (read the server's time)
 	v, err := c.Node(ua.NewNumericNodeID(0, 2258)).ValueWithContext(ctx)
diff --git a/examples/datetime/datetime.go b/examples/datetime/datetime.go
index 88a865d0..59a22f33 100644
--- a/examples/datetime/datetime.go
+++ b/examples/datetime/datetime.go
@@ -51,7 +51,7 @@ func main() {
 	if err := c.Connect(ctx); err != nil {
 		log.Fatal(err)
 	}
-	defer c.CloseSessionWithContext(ctx)
+	defer c.CloseWithContext(ctx)
 
 	v, err := c.Node(ua.NewNumericNodeID(0, 2258)).ValueWithContext(ctx)
 	switch {
diff --git a/examples/history-read/history-read.go b/examples/history-read/history-read.go
index 2fed4a28..e514ddc5 100644
--- a/examples/history-read/history-read.go
+++ b/examples/history-read/history-read.go
@@ -28,7 +28,7 @@ func main() {
 	if err := c.Connect(ctx); err != nil {
 		log.Fatal(err)
 	}
-	defer c.CloseSessionWithContext(ctx)
+	defer c.CloseWithContext(ctx)
 
 	id, err := ua.ParseNodeID(*nodeID)
 	if err != nil {
diff --git a/examples/method/method.go b/examples/method/method.go
index b1cf17d7..34dc47d0 100644
--- a/examples/method/method.go
+++ b/examples/method/method.go
@@ -28,7 +28,7 @@ func main() {
 	if err := c.Connect(ctx); err != nil {
 		log.Fatal(err)
 	}
-	defer c.CloseSessionWithContext(ctx)
+	defer c.CloseWithContext(ctx)
 
 	in := int64(12)
 	req := &ua.CallMethodRequest{
diff --git a/examples/monitor/monitor.go b/examples/monitor/monitor.go
index 4e4118ac..581d629b 100644
--- a/examples/monitor/monitor.go
+++ b/examples/monitor/monitor.go
@@ -68,7 +68,7 @@ func main() {
 		log.Fatal(err)
 	}
 
-	defer c.CloseSessionWithContext(ctx)
+	defer c.CloseWithContext(ctx)
 
 	m, err := monitor.NewNodeMonitor(c)
 	if err != nil {
diff --git a/examples/read/read.go b/examples/read/read.go
index 2e5beac5..27716c91 100644
--- a/examples/read/read.go
+++ b/examples/read/read.go
@@ -29,7 +29,7 @@ func main() {
 	if err := c.Connect(ctx); err != nil {
 		log.Fatal(err)
 	}
-	defer c.CloseSessionWithContext(ctx)
+	defer c.CloseWithContext(ctx)
 
 	id, err := ua.ParseNodeID(*nodeID)
 	if err != nil {
diff --git a/examples/regread/regread.go b/examples/regread/regread.go
index db5d1da7..dd86c401 100644
--- a/examples/regread/regread.go
+++ b/examples/regread/regread.go
@@ -29,7 +29,7 @@ func main() {
 	if err := c.Connect(ctx); err != nil {
 		log.Fatal(err)
 	}
-	defer c.CloseSessionWithContext(ctx)
+	defer c.CloseWithContext(ctx)
 
 	id, err := ua.ParseNodeID(*nodeID)
 	if err != nil {
diff --git a/examples/subscribe/subscribe.go b/examples/subscribe/subscribe.go
index 006cd65f..47ddc9b6 100644
--- a/examples/subscribe/subscribe.go
+++ b/examples/subscribe/subscribe.go
@@ -62,7 +62,7 @@ func main() {
 	if err := c.Connect(ctx); err != nil {
 		log.Fatal(err)
 	}
-	defer c.CloseSessionWithContext(ctx)
+	defer c.CloseWithContext(ctx)
 
 	notifyCh := make(chan *opcua.PublishNotificationData)
 
diff --git a/examples/translate/translate.go b/examples/translate/translate.go
index ad4b669b..91c8cdbe 100644
--- a/examples/translate/translate.go
+++ b/examples/translate/translate.go
@@ -31,7 +31,7 @@ func main() {
 	if err := c.Connect(ctx); err != nil {
 		log.Fatal(err)
 	}
-	defer c.CloseSessionWithContext(ctx)
+	defer c.CloseWithContext(ctx)
 
 	root := c.Node(ua.NewTwoByteNodeID(id.ObjectsFolder))
 	nodeID, err := root.TranslateBrowsePathInNamespaceToNodeIDWithContext(ctx, uint16(*ns), *nodePath)
diff --git a/examples/trigger/trigger.go b/examples/trigger/trigger.go
index 2cc37293..5502272d 100644
--- a/examples/trigger/trigger.go
+++ b/examples/trigger/trigger.go
@@ -63,7 +63,7 @@ func main() {
 	if err := c.Connect(ctx); err != nil {
 		log.Fatal(err)
 	}
-	defer c.CloseSessionWithContext(ctx)
+	defer c.CloseWithContext(ctx)
 
 	notifyCh := make(chan *opcua.PublishNotificationData)
 
diff --git a/examples/udt/udt.go b/examples/udt/udt.go
index 7cba5163..a67fc846 100644
--- a/examples/udt/udt.go
+++ b/examples/udt/udt.go
@@ -59,7 +59,7 @@ func main() {
 	if err := c.Connect(ctx); err != nil {
 		log.Fatal(err)
 	}
-	defer c.CloseSessionWithContext(ctx)
+	defer c.CloseWithContext(ctx)
 
 	v, err := c.Node(id).ValueWithContext(ctx)
 	switch {
diff --git a/examples/write/write.go b/examples/write/write.go
index 1521a6c2..1b3ae6c2 100644
--- a/examples/write/write.go
+++ b/examples/write/write.go
@@ -30,7 +30,7 @@ func main() {
 	if err := c.Connect(ctx); err != nil {
 		log.Fatal(err)
 	}
-	defer c.CloseSessionWithContext(ctx)
+	defer c.CloseWithContext(ctx)
 
 	id, err := ua.ParseNodeID(*nodeID)
 	if err != nil {