diff --git a/models/ciena/waveserverai/BUILD b/models/ciena/waveserverai/BUILD
index e41a676..1712d34 100644
--- a/models/ciena/waveserverai/BUILD
+++ b/models/ciena/waveserverai/BUILD
@@ -10,8 +10,8 @@
 
 yang_model(
     app_name = "org.onosproject.models.ciena.waveserverai",
-    title = "Ciena Waveserver Ai YANG Models",
     custom_registrator = True,
-    deps = COMPILE_DEPS,
     required_apps = APPS,
+    title = "Ciena Waveserver Ai YANG Models",
+    deps = COMPILE_DEPS,
 )
diff --git a/models/common/BUILD b/models/common/BUILD
index 3b845b3..e019d87 100644
--- a/models/common/BUILD
+++ b/models/common/BUILD
@@ -1,7 +1,7 @@
 load("//tools/build/bazel:yang.bzl", "yang_model")
 
 yang_model(
-  app_name = "org.onosproject.models.common",
-  title = "Common YANG Models",
-  custom_registrator = True,
+    app_name = "org.onosproject.models.common",
+    custom_registrator = True,
+    title = "Common YANG Models",
 )
diff --git a/models/huawei/BUILD b/models/huawei/BUILD
index 5a0a8a0..93be622 100644
--- a/models/huawei/BUILD
+++ b/models/huawei/BUILD
@@ -1,7 +1,7 @@
 load("//tools/build/bazel:yang.bzl", "yang_model")
 
-yang_model (
-  app_name = "org.onosproject.models.huawei",
-  title = "Huawei YANG Models",
-  custom_registrator = True,
+yang_model(
+    app_name = "org.onosproject.models.huawei",
+    custom_registrator = True,
+    title = "Huawei YANG Models",
 )
diff --git a/models/ietf/BUILD b/models/ietf/BUILD
index 9197c54..cdb559a 100644
--- a/models/ietf/BUILD
+++ b/models/ietf/BUILD
@@ -1,7 +1,7 @@
 load("//tools/build/bazel:yang.bzl", "yang_model")
 
-yang_model (
+yang_model(
     app_name = "org.onosproject.models.ietf",
-    title = "IETF YANG Models",
     custom_registrator = False,
+    title = "IETF YANG Models",
 )
diff --git a/models/l3vpn/BUILD b/models/l3vpn/BUILD
index 463f95b..d7b0870 100644
--- a/models/l3vpn/BUILD
+++ b/models/l3vpn/BUILD
@@ -10,8 +10,8 @@
 
 yang_model(
     app_name = "org.onosproject.models.l3vpn",
-    title = "L3VPN YANG Models",
     custom_registrator = True,
-    deps = COMPILE_DEPS,
     required_apps = APPS,
+    title = "L3VPN YANG Models",
+    deps = COMPILE_DEPS,
 )
diff --git a/models/microsemi/BUILD b/models/microsemi/BUILD
index a091a5c..2e56eb3 100644
--- a/models/microsemi/BUILD
+++ b/models/microsemi/BUILD
@@ -10,8 +10,8 @@
 
 yang_model(
     app_name = "org.onosproject.models.microsemi",
-    title = "Microsemi YANG Models",
     custom_registrator = True,
-    deps = COMPILE_DEPS,
     required_apps = APPS,
+    title = "Microsemi YANG Models",
+    deps = COMPILE_DEPS,
 )
diff --git a/models/openconfig-infinera/BUILD b/models/openconfig-infinera/BUILD
index 14ccc86..a4e0989 100644
--- a/models/openconfig-infinera/BUILD
+++ b/models/openconfig-infinera/BUILD
@@ -9,9 +9,9 @@
 ]
 
 yang_model(
-  app_name = "org.onosproject.models.openconfig-infinera",
-  title = "OpenConfig Infinera XT3300 YANG Models",
-  custom_registrator = False,
-  deps = COMPILE_DEPS,
-  required_apps = APPS,
+    app_name = "org.onosproject.models.openconfig-infinera",
+    custom_registrator = False,
+    required_apps = APPS,
+    title = "OpenConfig Infinera XT3300 YANG Models",
+    deps = COMPILE_DEPS,
 )
diff --git a/models/openconfig/BUILD b/models/openconfig/BUILD
index c8b2d33..a9926d4 100644
--- a/models/openconfig/BUILD
+++ b/models/openconfig/BUILD
@@ -9,9 +9,9 @@
 ]
 
 yang_model(
-  app_name = "org.onosproject.models.openconfig",
-  title = "OpenConfig YANG Models",
-  custom_registrator = True,
-  deps = COMPILE_DEPS,
-  required_apps = APPS,
+    app_name = "org.onosproject.models.openconfig",
+    custom_registrator = True,
+    required_apps = APPS,
+    title = "OpenConfig YANG Models",
+    deps = COMPILE_DEPS,
 )
diff --git a/models/openroadm/BUILD b/models/openroadm/BUILD
index 619fd61..b2b4f77 100644
--- a/models/openroadm/BUILD
+++ b/models/openroadm/BUILD
@@ -1,6 +1,6 @@
 load("//tools/build/bazel:yang.bzl", "yang_model")
 
 yang_model(
-  app_name = "org.onosproject.models.openroadm",
-  title = "Open ROADM YANG Models",
-)
\ No newline at end of file
+    app_name = "org.onosproject.models.openroadm",
+    title = "Open ROADM YANG Models",
+)
diff --git a/models/polatis/BUILD b/models/polatis/BUILD
index 1ec001b..13e32fb 100644
--- a/models/polatis/BUILD
+++ b/models/polatis/BUILD
@@ -8,9 +8,9 @@
     "org.onosproject.models.common",
 ]
 
-yang_model (
-  app_name = "org.onosproject.models.polatis",
-  title = "Polatis YANG Model",
-  deps = COMPILE_DEPS,
-  required_apps = APPS,
+yang_model(
+    app_name = "org.onosproject.models.polatis",
+    required_apps = APPS,
+    title = "Polatis YANG Model",
+    deps = COMPILE_DEPS,
 )
diff --git a/models/tapi/BUILD b/models/tapi/BUILD
index e594675..a0e3c76 100644
--- a/models/tapi/BUILD
+++ b/models/tapi/BUILD
@@ -1,7 +1,7 @@
 load("//tools/build/bazel:yang.bzl", "yang_model")
 
 yang_model(
-  app_name = "org.onosproject.models.tapi",
-  title = "ONF Transport API YANG Models",
-  custom_registrator = True,
+    app_name = "org.onosproject.models.tapi",
+    custom_registrator = True,
+    title = "ONF Transport API YANG Models",
 )