core: Rename vom2 to vom.

Change-Id: I826c781cb60939d49cc13cca4a4d7a99d3c74730
MultiPart: 1/5
diff --git a/security/util.go b/security/util.go
index 40e37b6..75e5757 100644
--- a/security/util.go
+++ b/security/util.go
@@ -12,7 +12,7 @@
 	"io/ioutil"
 
 	"v.io/core/veyron2/security"
-	"v.io/core/veyron2/vom2"
+	"v.io/core/veyron2/vom"
 )
 
 const ecPrivateKeyPEMType = "EC PRIVATE KEY"
@@ -99,7 +99,7 @@
 	var tpCaveats []security.ThirdPartyCaveat
 	for _, c := range caveats {
 		var t security.ThirdPartyCaveat
-		if err := vom2.Decode(c.ValidatorVOM, &t); err != nil {
+		if err := vom.Decode(c.ValidatorVOM, &t); err != nil {
 			continue
 		}
 		tpCaveats = append(tpCaveats, t)