diff --git a/commons/passive/ticwatch/ppg.avsc b/commons/passive/ticwatch/ppg.avsc
deleted file mode 100644
index 84fc49ac..00000000
--- a/commons/passive/ticwatch/ppg.avsc
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-    "namespace": "org.radarcns.passive.ticWatch",
-    "type": "record",
-    "name": "TicWatchPPG",
-    "doc": "PPG collected using a Mobovi TicWatch.",
-    "fields": [
-        { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." },
-        { "name": "redled", "type": "float", "doc": "red LED" },
-        { "name": "iredled", "type": "float", "doc": "infrared LED" }
-    ]
-}
\ No newline at end of file
diff --git a/commons/passive/ticwatch/acceleration.avsc b/commons/passive/ticwatch/ticwatch_acceleration.avsc
similarity index 84%
rename from commons/passive/ticwatch/acceleration.avsc
rename to commons/passive/ticwatch/ticwatch_acceleration.avsc
index 5a538755..edb18ffc 100644
--- a/commons/passive/ticwatch/acceleration.avsc
+++ b/commons/passive/ticwatch/ticwatch_acceleration.avsc
@@ -1,7 +1,7 @@
 {
-    "namespace": "org.radarcns.passive.ticWatch",
+    "namespace": "org.radarcns.passive.ticwatch",
     "type": "record",
-    "name": "TicWatchAcceleration",
+    "name": "TicwatchAcceleration",
     "doc": "Data from 3-axis accelerometer sensor of a Mobovi TicWatch device.",
     "fields": [
         { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." },
diff --git a/commons/passive/ticwatch/battery.avsc b/commons/passive/ticwatch/ticwatch_battery_level.avsc
similarity index 78%
rename from commons/passive/ticwatch/battery.avsc
rename to commons/passive/ticwatch/ticwatch_battery_level.avsc
index ea606eb0..e97e7c65 100644
--- a/commons/passive/ticwatch/battery.avsc
+++ b/commons/passive/ticwatch/ticwatch_battery_level.avsc
@@ -1,7 +1,7 @@
 {
-    "namespace": "org.radarcns.passive.ticWatch",
+    "namespace": "org.radarcns.passive.ticwatch",
     "type": "record",
-    "name": "TicWatchBatteryLevel",
+    "name": "TicwatchBatteryLevel",
     "doc": "Battery level of a TicWatch device.",
     "fields": [
         { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." },
diff --git a/commons/passive/ticwatch/gyroscope.avsc b/commons/passive/ticwatch/ticwatch_gyroscope.avsc
similarity index 85%
rename from commons/passive/ticwatch/gyroscope.avsc
rename to commons/passive/ticwatch/ticwatch_gyroscope.avsc
index a7711cc2..b5b44a0a 100644
--- a/commons/passive/ticwatch/gyroscope.avsc
+++ b/commons/passive/ticwatch/ticwatch_gyroscope.avsc
@@ -1,7 +1,7 @@
 {
-    "namespace": "org.radarcns.passive.ticWatch",
+    "namespace": "org.radarcns.passive.ticwatch",
     "type": "record",
-    "name": "TicWatchGyroscope",
+    "name": "TicwatchGyroscope",
     "doc": "Data from 3-axis gyroscope sensor of a Mobovi TicWatch device.",
     "fields": [
         { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." },
diff --git a/commons/passive/ticwatch/ticwatch_ppg.avsc b/commons/passive/ticwatch/ticwatch_ppg.avsc
new file mode 100644
index 00000000..85c9352a
--- /dev/null
+++ b/commons/passive/ticwatch/ticwatch_ppg.avsc
@@ -0,0 +1,11 @@
+{
+    "namespace": "org.radarcns.passive.ticwatch",
+    "type": "record",
+    "name": "TicwatchPPG",
+    "doc": "PPG collected using a Mobovi TicWatch.",
+    "fields": [
+        { "name": "time", "type": "double", "doc": "Device timestamp in UTC (ms)." },
+        { "name": "redled", "type": "float", "doc": "Red LED." },
+        { "name": "iredled", "type": "float", "doc": "Infrared LED." }
+    ]
+}
\ No newline at end of file
diff --git a/specifications/passive/ticwatch-1.0.0.yml b/specifications/passive/ticwatch-1.0.0.yml
index 2b3a2ce5..297f9528 100644
--- a/specifications/passive/ticwatch-1.0.0.yml
+++ b/specifications/passive/ticwatch-1.0.0.yml
@@ -1,7 +1,8 @@
 #====================================== TicWatch device =====================================#
-vendor: MOBOVI
+vendor: Mobobi
 model: TicWatch
 version: 1.0.0
+app_provider: .ticwatch.TicwatchSeviceProvier
 data:
   - type: ACCELEROMETER
     sample_rate:
@@ -9,27 +10,27 @@ data:
     unit: g
     processing_state: RAW
     topic: android_esl_ticwatch_acceleration
-    value_schema: .passive.esl.TicWatchAcceleration
+    value_schema: .passive.ticwatch.TicwatchAcceleration
   - type: GYROSCOPE
     sample_rate:
       dynamic: true
     unit: rad/s
     processing_state: RAW
     topic: android_esl_ticwatch_gyroscope
-    value_schema: .passive.esl.TicWatchGyroscope
+    value_schema: .passive.ticwatch.TicwatchGyroscope
   - type: BATTERY
     sample_rate:
       dynamic: true
     unit: PERCENTAGE
     processing_state: RAW
     topic: android_esl_ticwatch_battery_level
-    value_schema: .passive.esl.TicWatchBatteryLevel
+    value_schema: .passive.ticwatch.TicwatchBatteryLevel
   - type: PPG
     sample_rate:
       dynamic: true
     processing_state: RAW
     topic: android_esl_ticwatch_ppg
-    value_schema: .passive.esl.TicWatchPPG
+    value_schema: .passive.ticwatch.TicwatchPpg
   - type: EXTERNAL_TIME
     doc: Information sent by the Mobovi Ticwatch about time synchronisation with a NTP server.
     sample_rate:
@@ -38,7 +39,7 @@ data:
     topic: application_external_time
     value_schema: .monitor.application.ApplicationExternalTime
   - type: DEVICE_INFO
-    doc: Device information where the app is installed
+    doc: Device information where the app is installed.
     sample_rate:
       dynamic: true
     topic: application_device_info