diff --git a/samples/template/TIDES/datapackage.json b/samples/template/TIDES/datapackage.json
index c667a37a..dd0e5cca 100644
--- a/samples/template/TIDES/datapackage.json
+++ b/samples/template/TIDES/datapackage.json
@@ -3,7 +3,7 @@
     "title": "Template TIDES Data Package Example",
     "agency": "Transit Agency Name",
     "ntd_id": "1234-56",
-    "profile": "https://raw.githubusercontent.com/TIDES-transit/TIDES/sample-data-doc/spec/tides-datapackage-profile.json",
+    "profile": "https://raw.githubusercontent.com/TIDES-transit/TIDES/main/spec/tides-datapackage-profile.json",
     "licenses": [
         {
             "name": "Apache-2.0"
@@ -28,7 +28,7 @@
             "name": "devices",
             "profile": "tabular-data-resource",
             "path": "devices.csv",
-            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/sample-data-doc/spec/devices.schema.json",
+            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/main/spec/devices.schema.json",
             "sources": [
                 {
                     "title": "Where did data come from?",
@@ -42,7 +42,7 @@
             "name": "vehicle_locations",
             "profile": "tabular-data-resource",
             "path": "vehicle_locations.csv",
-            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/sample-data-doc/spec/vehicle_locations.schema.json",
+            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/main/spec/vehicle_locations.schema.json",
             "sources": [
                 {
                     "title": "Where did data come from?",
@@ -56,7 +56,7 @@
             "name": "fare_transactions",
             "profile": "tabular-data-resource",
             "path": "fare_transactions.csv",
-            "schema":"https://raw.githubusercontent.com/TIDES-transit/TIDES/sample-data-doc/spec/fare_transactions.schema.json",
+            "schema":"https://raw.githubusercontent.com/TIDES-transit/TIDES/main/spec/fare_transactions.schema.json",
             "sources": [
                 {
                     "title": "Where did data come from?",
@@ -70,7 +70,7 @@
             "name": "train_cars",
             "profile": "tabular-data-resource",
             "path": "train_cars.csv",
-            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/sample-data-doc/spec/train_cars.schema.json",
+            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/main/spec/train_cars.schema.json",
             "sources": [
                 {
                     "title": "Where did data come from?",
@@ -84,7 +84,7 @@
             "name": "operators",
             "profile": "tabular-data-resource",
             "path": "operators.csv",
-            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/sample-data-doc/spec/operators.schema.json",
+            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/main/spec/operators.schema.json",
             "sources": [
                 {
                     "title": "Where did data come from?",
@@ -98,7 +98,7 @@
             "name": "stop_visits",
             "profile": "tabular-data-resource",
             "path": "stop_visits.csv",
-            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/sample-data-doc/spec/stop_visits.schema.json",
+            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/main/spec/stop_visits.schema.json",
             "sources": [
                 {
                     "title": "Where did data come from?",
@@ -112,7 +112,7 @@
             "name": "vehicle_train_cars",
             "profile": "tabular-data-resource",
             "path": "vehicle_train_cars.csv",
-            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/sample-data-doc/spec/vehicle_train_cars.schema.json",
+            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/main/spec/vehicle_train_cars.schema.json",
             "sources": [
                 {
                     "title": "Where did data come from?",
@@ -126,7 +126,7 @@
             "name": "vehicles",
             "profile": "tabular-data-resource",
             "path": "vehicles.csv",
-            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/sample-data-doc/spec/vehicles.schema.json",
+            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/main/spec/vehicles.schema.json",
             "sources": [
                 {
                     "title": "Where did data come from?",
@@ -140,7 +140,7 @@
             "name": "trips_performed",
             "profile": "tabular-data-resource",
             "path": "trips_performed.csv",
-            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/sample-data-doc/spec/trips_performed.schema.json",
+            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/main/spec/trips_performed.schema.json",
             "sources": [
                 {
                     "title": "Where did data come from?",
@@ -154,7 +154,7 @@
             "name": "station_activities",
             "profile": "tabular-data-resource",
             "path": "station_activities.csv",
-            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/sample-data-doc/spec/station_activities.schema.json",
+            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/main/spec/station_activities.schema.json",
             "sources": [
                 {
                     "title": "Where did data come from?",
@@ -168,7 +168,7 @@
             "name": "passenger_events",
             "profile": "tabular-data-resource",
             "path": "passenger_events.csv",
-            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/sample-data-doc/spec/passenger_events.schema.json",
+            "schema": "https://raw.githubusercontent.com/TIDES-transit/TIDES/main/spec/passenger_events.schema.json",
             "sources": [
                 {
                     "title": "Where did data come from?",
diff --git a/samples/template/TIDES/passenger_events.csv b/samples/template/TIDES/passenger_events.csv
index d4ece193..77a2ee92 100644
--- a/samples/template/TIDES/passenger_events.csv
+++ b/samples/template/TIDES/passenger_events.csv
@@ -1 +1 @@
-passenger_event_id,date,timestamp,trip_id_performed,stop_sequence,event_type,vehicle_id,device_id,train_car_id,stop_id,service_date,passenger_events,event_timestamp
+passenger_event_id,service_date,event_timestamp,trip_id_performed,trip_id_scheduled,trip_stop_sequence,scheduled_stop_sequence,event_type,vehicle_id,device_id,train_car_id,stop_id,pattern_id,event_count
diff --git a/samples/template/TIDES/stop_visits.csv b/samples/template/TIDES/stop_visits.csv
index ecc6c3b7..d617b8a4 100644
--- a/samples/template/TIDES/stop_visits.csv
+++ b/samples/template/TIDES/stop_visits.csv
@@ -1 +1 @@
-date,trip_id_performed,stop_sequence,vehicle_id,dwell,stop_id,checkpoint,schedule_arrival_time,schedule_departure_time,actual_arrival_time,actual_departure_time,distance,boarding_1,alighting_1,boarding_2,alighting_2,load,door_open,door_close,door_status,ramp_deployed_time,ramp_failure,kneel_deployed_time,lift_deployed_time,bike_rack_deployed,bike_load,revenue,number_of_transactions,transaction_revenue_cash,transaction_revenue_smartcard,transaction_revenue_magcard,transaction_revenue_bankcard,transaction_revenue_nfc,transaction_revenue_optical,transaction_revenue_operator,transaction_revenue_other,transaction_count_cash,transaction_count_smartcard,transaction_count_magcard,transaction_count_bankcard,transaction_count_nfc,transaction_count_optical,transaction_count_operator,transaction_count_other,schedule_relationship,service_date
+service_date,trip_id_performed,trip_stop_sequence,scheduled_stop_sequence,pattern_id,vehicle_id,dwell,stop_id,timepoint,schedule_arrival_time,schedule_departure_time,actual_arrival_time,actual_departure_time,distance,boarding_1,alighting_1,boarding_2,alighting_2,departure_load,door_open,door_close,door_status,ramp_deployed_time,ramp_failure,kneel_deployed_time,lift_deployed_time,bike_rack_deployed,bike_load,revenue,number_of_transactions,schedule_relationship