Enforce naming convention regarding abbreviations

Change-Id: Ic81038d3869268a55624ccbbf66048545158b0da
diff --git a/protocols/ovsdb/rfc/src/main/java/org/onosproject/ovsdb/rfc/tableservice/AbstractOvsdbTableService.java b/protocols/ovsdb/rfc/src/main/java/org/onosproject/ovsdb/rfc/tableservice/AbstractOvsdbTableService.java
index af1a01d..8e05174 100644
--- a/protocols/ovsdb/rfc/src/main/java/org/onosproject/ovsdb/rfc/tableservice/AbstractOvsdbTableService.java
+++ b/protocols/ovsdb/rfc/src/main/java/org/onosproject/ovsdb/rfc/tableservice/AbstractOvsdbTableService.java
@@ -25,7 +25,7 @@
 import org.onosproject.ovsdb.rfc.exception.VersionMismatchException;
 import org.onosproject.ovsdb.rfc.notation.Column;
 import org.onosproject.ovsdb.rfc.notation.Row;
-import org.onosproject.ovsdb.rfc.notation.UUID;
+import org.onosproject.ovsdb.rfc.notation.Uuid;
 import org.onosproject.ovsdb.rfc.schema.ColumnSchema;
 import org.onosproject.ovsdb.rfc.schema.DatabaseSchema;
 import org.onosproject.ovsdb.rfc.schema.TableSchema;
@@ -196,12 +196,12 @@
     }
 
     @Override
-    public UUID getTableUuid() {
+    public Uuid getTableUuid() {
         if (!isValid()) {
             return null;
         }
         ColumnDescription columnDesc = new ColumnDescription("_uuid", "getTableUuid");
-        return (UUID) getDataHandler(columnDesc);
+        return (Uuid) getDataHandler(columnDesc);
     }
 
     @Override
@@ -214,12 +214,12 @@
     }
 
     @Override
-    public UUID getTableVersion() {
+    public Uuid getTableVersion() {
         if (!isValid()) {
             return null;
         }
         ColumnDescription columnDesc = new ColumnDescription("_version", "getTableVersion");
-        return (UUID) getDataHandler(columnDesc);
+        return (Uuid) getDataHandler(columnDesc);
     }
 
     @Override
diff --git a/protocols/ovsdb/rfc/src/main/java/org/onosproject/ovsdb/rfc/tableservice/OvsdbTableService.java b/protocols/ovsdb/rfc/src/main/java/org/onosproject/ovsdb/rfc/tableservice/OvsdbTableService.java
index 58b656e..9e10601 100644
--- a/protocols/ovsdb/rfc/src/main/java/org/onosproject/ovsdb/rfc/tableservice/OvsdbTableService.java
+++ b/protocols/ovsdb/rfc/src/main/java/org/onosproject/ovsdb/rfc/tableservice/OvsdbTableService.java
@@ -16,7 +16,7 @@
 package org.onosproject.ovsdb.rfc.tableservice;
 
 import org.onosproject.ovsdb.rfc.notation.Column;
-import org.onosproject.ovsdb.rfc.notation.UUID;
+import org.onosproject.ovsdb.rfc.notation.Uuid;
 
 /**
  * Representation of conversion between Ovsdb table and Row.
@@ -48,7 +48,7 @@
      * Returns UUID which column name is _uuid.
      * @return UUID
      */
-    public UUID getTableUuid();
+    public Uuid getTableUuid();
 
     /**
      * Returns UUID Column which column name is _uuid.
@@ -60,7 +60,7 @@
      * Returns UUID which column name is _version.
      * @return UUID
      */
-    public UUID getTableVersion();
+    public Uuid getTableVersion();
 
     /**
      * Returns UUID Column which column name is _version.