diff --git a/profiles/internal/naming/endpoint.go b/profiles/internal/naming/endpoint.go
index e757878..e38f3cf 100644
--- a/profiles/internal/naming/endpoint.go
+++ b/profiles/internal/naming/endpoint.go
@@ -232,7 +232,7 @@
 	return Network
 }
 
-var defaultVersion = 3 // TODO(ashankar): Change to 4?
+var defaultVersion = 5
 
 func (ep *Endpoint) VersionedString(version int) string {
 	switch version {
diff --git a/profiles/internal/naming/endpoint_test.go b/profiles/internal/naming/endpoint_test.go
index 0f39365..cd91fee 100644
--- a/profiles/internal/naming/endpoint_test.go
+++ b/profiles/internal/naming/endpoint_test.go
@@ -213,16 +213,16 @@
 
 func TestEndpointDefaults(t *testing.T) {
 	testcases := []endpointTest{
-		{"@1@tcp@batman@@@", "@3@tcp@batman@00000000000000000000000000000000@@@m@@", nil},
-		{"@2@tcp@robin@@@@@", "@3@tcp@robin@00000000000000000000000000000000@@@m@@", nil},
-		{"@1@@@@@", "@3@@:0@00000000000000000000000000000000@@@m@@", nil},
-		{"@2@@@@@@@", "@3@@:0@00000000000000000000000000000000@@@m@@", nil},
-		{"@1@tcp@batman:12@@@", "@3@tcp@batman:12@00000000000000000000000000000000@@@m@@", nil},
-		{"@2@tcp@foo:12@@9@@@", "@3@tcp@foo:12@00000000000000000000000000000000@9@@m@@", nil},
-		{"@2@tcp@foo:12@@@4@@", "@3@tcp@foo:12@00000000000000000000000000000000@@4@m@@", nil},
-		{"@2@tcp@foo:12@@2@4@@", "@3@tcp@foo:12@00000000000000000000000000000000@2@4@m@@", nil},
-		{"@3@@host:11@@@@m@@", "@3@@host:11@00000000000000000000000000000000@@@m@@", nil},
-		{"@3@@host:12@@@@@@", "@3@@host:12@00000000000000000000000000000000@@@m@@", nil},
+		{"@1@tcp@batman@@@", "@5@tcp@batman@00000000000000000000000000000000@m@@@", nil},
+		{"@2@tcp@robin@@@@@", "@5@tcp@robin@00000000000000000000000000000000@m@@@", nil},
+		{"@1@@@@@", "@5@@:0@00000000000000000000000000000000@m@@@", nil},
+		{"@2@@@@@@@", "@5@@:0@00000000000000000000000000000000@m@@@", nil},
+		{"@1@tcp@batman:12@@@", "@5@tcp@batman:12@00000000000000000000000000000000@m@@@", nil},
+		{"@2@tcp@foo:12@@9@@@", "@5@tcp@foo:12@00000000000000000000000000000000@m@@@", nil},
+		{"@2@tcp@foo:12@@@4@@", "@5@tcp@foo:12@00000000000000000000000000000000@m@@@", nil},
+		{"@2@tcp@foo:12@@2@4@@", "@5@tcp@foo:12@00000000000000000000000000000000@m@@@", nil},
+		{"@3@@host:11@@@@m@@", "@5@@host:11@00000000000000000000000000000000@m@@@", nil},
+		{"@3@@host:12@@@@@@", "@5@@host:12@00000000000000000000000000000000@m@@@", nil},
 	}
 	runEndpointTests(t, testcases)
 }