diff --git a/session/container.go b/session/container.go
index ec82485..ed75456 100644
--- a/session/container.go
+++ b/session/container.go
@@ -22,12 +22,12 @@ func NewContainerContext() *ContainerContext {
 	v2 := new(session.ContainerSessionContext)
 	v2.SetWildcard(true)
 
-	return ContainerContextFromV2(v2)
+	return NewContainerContextFromV2(v2)
 }
 
-// ContainerContextFromV2 wraps session.ContainerSessionContext
+// NewContainerContextFromV2 wraps session.ContainerSessionContext
 // into ContainerContext.
-func ContainerContextFromV2(v *session.ContainerSessionContext) *ContainerContext {
+func NewContainerContextFromV2(v *session.ContainerSessionContext) *ContainerContext {
 	return (*ContainerContext)(v)
 }
 
@@ -47,7 +47,7 @@ func (x *ContainerContext) ApplyTo(id *cid.ID) {
 	v2.SetContainerID(id.ToV2())
 }
 
-// ActOnAllContainers is a helper function that conveniently
+// ApplyToAllContainers is a helper function that conveniently
 // applies ContainerContext to all containers.
 func ApplyToAllContainers(c *ContainerContext) {
 	c.ApplyTo(nil)
diff --git a/session/object.go b/session/object.go
index e9be63a..8dfb344 100644
--- a/session/object.go
+++ b/session/object.go
@@ -21,12 +21,12 @@ type ObjectContext session.ObjectSessionContext
 func NewObjectContext() *ObjectContext {
 	v2 := new(session.ObjectSessionContext)
 
-	return ObjectContextFromV2(v2)
+	return NewObjectContextFromV2(v2)
 }
 
-// ObjectContextFromV2 wraps session.ObjectSessionContext
+// NewObjectContextFromV2 wraps session.ObjectSessionContext
 // into ObjectContext.
-func ObjectContextFromV2(v *session.ObjectSessionContext) *ObjectContext {
+func NewObjectContextFromV2(v *session.ObjectSessionContext) *ObjectContext {
 	return (*ObjectContext)(v)
 }
 
diff --git a/session/session.go b/session/session.go
index 119eca6..ffefb3a 100644
--- a/session/session.go
+++ b/session/session.go
@@ -236,9 +236,9 @@ func (t *Token) Context() interface{} {
 	default:
 		return nil
 	case *session.ContainerSessionContext:
-		return ContainerContextFromV2(c)
+		return NewContainerContextFromV2(c)
 	case *session.ObjectSessionContext:
-		return ObjectContextFromV2(c)
+		return NewObjectContextFromV2(c)
 	}
 }