diff --git a/src/main/java/org/mtransit/parser/config/gtfs/data/AgencyConfig.kt b/src/main/java/org/mtransit/parser/config/gtfs/data/AgencyConfig.kt
index cda0c06..0f561bf 100644
--- a/src/main/java/org/mtransit/parser/config/gtfs/data/AgencyConfig.kt
+++ b/src/main/java/org/mtransit/parser/config/gtfs/data/AgencyConfig.kt
@@ -13,7 +13,7 @@ data class AgencyConfig(
     /**
      * Route type filter (integer from GTFS Static `routes.txt` > `route_type` field)
      * (useful when multiple route type in same GTFS)
-     * @see [https://developers.google.com/transit/gtfs/reference#routestxt]
+     * @see [https://gtfs.org/reference/static/#routestxt]
      */
     @SerialName("target_route_type_id")
     val targetRouteTypeId: Int, // REQUIRED
diff --git a/src/main/java/org/mtransit/parser/gtfs/data/GAgency.kt b/src/main/java/org/mtransit/parser/gtfs/data/GAgency.kt
index d3126c8..33a157f 100644
--- a/src/main/java/org/mtransit/parser/gtfs/data/GAgency.kt
+++ b/src/main/java/org/mtransit/parser/gtfs/data/GAgency.kt
@@ -6,7 +6,6 @@ import org.mtransit.commons.gtfs.data.AgencyId
 import org.mtransit.parser.MTLog
 
 // https://gtfs.org/schedule/reference/#agencytxt
-// https://developers.google.com/transit/gtfs/reference#agency_fields
 data class GAgency(
     val agencyIdInt: Int,
     val agencyName: String,
diff --git a/src/main/java/org/mtransit/parser/gtfs/data/GCalendar.kt b/src/main/java/org/mtransit/parser/gtfs/data/GCalendar.kt
index 9a85573..2c9add0 100644
--- a/src/main/java/org/mtransit/parser/gtfs/data/GCalendar.kt
+++ b/src/main/java/org/mtransit/parser/gtfs/data/GCalendar.kt
@@ -4,7 +4,6 @@ import androidx.annotation.Discouraged
 import org.mtransit.parser.MTLog
 import java.util.Calendar
 
-// https://developers.google.com/transit/gtfs/reference#calendar_fields
 // https://gtfs.org/reference/static/#calendartxt
 data class GCalendar(
     val serviceIdInt: Int,
diff --git a/src/main/java/org/mtransit/parser/gtfs/data/GCalendarDate.kt b/src/main/java/org/mtransit/parser/gtfs/data/GCalendarDate.kt
index b00e6f1..e36f7b4 100644
--- a/src/main/java/org/mtransit/parser/gtfs/data/GCalendarDate.kt
+++ b/src/main/java/org/mtransit/parser/gtfs/data/GCalendarDate.kt
@@ -11,7 +11,6 @@ import org.mtransit.parser.gtfs.data.GFieldTypes.isDate
 import java.lang.Integer.max
 import java.lang.Integer.min
 
-// https://developers.google.com/transit/gtfs/reference#calendar_dates_fields
 // https://gtfs.org/reference/static/#calendar_datestxt
 data class GCalendarDate(
     val serviceIdInt: Int,
diff --git a/src/main/java/org/mtransit/parser/gtfs/data/GDirectionId.kt b/src/main/java/org/mtransit/parser/gtfs/data/GDirectionId.kt
index b3e6b58..6b20c26 100644
--- a/src/main/java/org/mtransit/parser/gtfs/data/GDirectionId.kt
+++ b/src/main/java/org/mtransit/parser/gtfs/data/GDirectionId.kt
@@ -2,7 +2,6 @@ package org.mtransit.parser.gtfs.data
 
 import org.mtransit.parser.MTLog
 
-// https://developers.google.com/transit/gtfs/reference#tripstxt
 // https://gtfs.org/reference/static/#tripstxt
 enum class GDirectionId(val id: Int) {
 
diff --git a/src/main/java/org/mtransit/parser/gtfs/data/GDropOffType.kt b/src/main/java/org/mtransit/parser/gtfs/data/GDropOffType.kt
index 2700cfc..cb9647b 100644
--- a/src/main/java/org/mtransit/parser/gtfs/data/GDropOffType.kt
+++ b/src/main/java/org/mtransit/parser/gtfs/data/GDropOffType.kt
@@ -2,7 +2,7 @@ package org.mtransit.parser.gtfs.data
 
 import org.mtransit.parser.MTLog
 
-// https://developers.google.com/transit/gtfs/reference#stop_times_drop_off_type_field
+// https://gtfs.org/schedule/reference/#stop_timestxt
 enum class GDropOffType(val id: Int) {
 
     REGULAR(0),
diff --git a/src/main/java/org/mtransit/parser/gtfs/data/GFieldTypes.kt b/src/main/java/org/mtransit/parser/gtfs/data/GFieldTypes.kt
index cfab865..4dbf77c 100644
--- a/src/main/java/org/mtransit/parser/gtfs/data/GFieldTypes.kt
+++ b/src/main/java/org/mtransit/parser/gtfs/data/GFieldTypes.kt
@@ -7,7 +7,6 @@ import java.util.Calendar
 import java.util.Date
 import java.util.Locale
 
-// https://developers.google.com/transit/gtfs/reference#field_types
 // https://gtfs.org/schedule/reference/#field-types
 @Suppress("unused", "MemberVisibilityCanBePrivate")
 object GFieldTypes {
diff --git a/src/main/java/org/mtransit/parser/gtfs/data/GFrequency.kt b/src/main/java/org/mtransit/parser/gtfs/data/GFrequency.kt
index 666223d..86a4f60 100644
--- a/src/main/java/org/mtransit/parser/gtfs/data/GFrequency.kt
+++ b/src/main/java/org/mtransit/parser/gtfs/data/GFrequency.kt
@@ -7,7 +7,6 @@ import org.mtransit.parser.gtfs.GAgencyTools
 import java.util.Date
 import java.util.concurrent.TimeUnit
 
-// https://developers.google.com/transit/gtfs/reference#frequenciestxt
 // https://gtfs.org/reference/static/#frequenciestxt
 data class GFrequency(
     val tripIdInt: Int,
diff --git a/src/main/java/org/mtransit/parser/gtfs/data/GPickupType.kt b/src/main/java/org/mtransit/parser/gtfs/data/GPickupType.kt
index fb10dda..e39b20a 100644
--- a/src/main/java/org/mtransit/parser/gtfs/data/GPickupType.kt
+++ b/src/main/java/org/mtransit/parser/gtfs/data/GPickupType.kt
@@ -2,7 +2,7 @@ package org.mtransit.parser.gtfs.data
 
 import org.mtransit.parser.MTLog
 
-// https://developers.google.com/transit/gtfs/reference#stop_times_pickup_type_field
+// https://gtfs.org/schedule/reference/#stop_timestxt
 enum class GPickupType(val id: Int) {
 
     REGULAR(0),
diff --git a/src/main/java/org/mtransit/parser/gtfs/data/GRoute.kt b/src/main/java/org/mtransit/parser/gtfs/data/GRoute.kt
index 87d6715..c6acb32 100644
--- a/src/main/java/org/mtransit/parser/gtfs/data/GRoute.kt
+++ b/src/main/java/org/mtransit/parser/gtfs/data/GRoute.kt
@@ -10,7 +10,6 @@ import org.mtransit.parser.MTLog
 import org.mtransit.parser.gtfs.GAgencyTools
 import kotlin.math.max
 
-// https://developers.google.com/transit/gtfs/reference#routestxt
 // https://gtfs.org/reference/static/#routestxt
 data class GRoute(
     val agencyIdInt: Int, // Optional (or empty)
diff --git a/src/main/java/org/mtransit/parser/gtfs/data/GRouteType.kt b/src/main/java/org/mtransit/parser/gtfs/data/GRouteType.kt
index 0733ac1..f0d5aae 100644
--- a/src/main/java/org/mtransit/parser/gtfs/data/GRouteType.kt
+++ b/src/main/java/org/mtransit/parser/gtfs/data/GRouteType.kt
@@ -1,6 +1,6 @@
 package org.mtransit.parser.gtfs.data
 
-// https://developers.google.com/transit/gtfs/reference/#routestxt
+// https://gtfs.org/reference/static/#routestxt
 enum class GRouteType(
     val id: Int
 ) {
diff --git a/src/main/java/org/mtransit/parser/gtfs/data/GSpec.java b/src/main/java/org/mtransit/parser/gtfs/data/GSpec.java
index 7ef497c..ae295df 100644
--- a/src/main/java/org/mtransit/parser/gtfs/data/GSpec.java
+++ b/src/main/java/org/mtransit/parser/gtfs/data/GSpec.java
@@ -26,8 +26,8 @@
 import java.util.Set;
 import java.util.concurrent.TimeUnit;
 
-// https://developers.google.com/transit/gtfs/reference#FeedFiles
-// https://developers.google.com/transit/gtfs/reference/difference-gtfs-transit-implement
+// https://gtfs.org/schedule/reference
+// https://gtfs.org/schedule/best-practices
 @SuppressWarnings({"RedundantSuppression", "WeakerAccess"})
 public class GSpec {
 
diff --git a/src/main/java/org/mtransit/parser/gtfs/data/GStop.kt b/src/main/java/org/mtransit/parser/gtfs/data/GStop.kt
index 789ce7b..2866d46 100644
--- a/src/main/java/org/mtransit/parser/gtfs/data/GStop.kt
+++ b/src/main/java/org/mtransit/parser/gtfs/data/GStop.kt
@@ -9,7 +9,6 @@ import org.mtransit.parser.MTLog
 import org.mtransit.parser.gtfs.GAgencyTools
 import kotlin.math.floor
 
-// https://developers.google.com/transit/gtfs/reference#stops_fields
 // https://gtfs.org/schedule/reference/#stopstxt
 data class GStop(
     val stopIdInt: Int,
diff --git a/src/main/java/org/mtransit/parser/gtfs/data/GStopTime.kt b/src/main/java/org/mtransit/parser/gtfs/data/GStopTime.kt
index 45ede87..3d1620f 100644
--- a/src/main/java/org/mtransit/parser/gtfs/data/GStopTime.kt
+++ b/src/main/java/org/mtransit/parser/gtfs/data/GStopTime.kt
@@ -9,7 +9,6 @@ import org.mtransit.parser.gtfs.GAgencyTools
 import java.util.Date
 
 // https://gtfs.org/schedule/reference/#stop_timestxt
-// https://developers.google.com/transit/gtfs/reference#stop_times_fields
 data class GStopTime(
     val tripIdInt: Int,
     private val _arrivalTime: Int,
diff --git a/src/main/java/org/mtransit/parser/gtfs/data/GTimePoint.kt b/src/main/java/org/mtransit/parser/gtfs/data/GTimePoint.kt
index 2a94caf..52a8ae0 100644
--- a/src/main/java/org/mtransit/parser/gtfs/data/GTimePoint.kt
+++ b/src/main/java/org/mtransit/parser/gtfs/data/GTimePoint.kt
@@ -3,7 +3,6 @@ package org.mtransit.parser.gtfs.data
 import org.mtransit.parser.MTLog
 
 // https://gtfs.org/schedule/reference/#stop_timestxt
-// https://developers.google.com/transit/gtfs/reference#stop_timestxt
 enum class GTimePoint(val id: Int) {
 
     APPROXIMATE(0),
diff --git a/src/main/java/org/mtransit/parser/gtfs/data/GTrip.kt b/src/main/java/org/mtransit/parser/gtfs/data/GTrip.kt
index 0e3a808..bf28c5a 100644
--- a/src/main/java/org/mtransit/parser/gtfs/data/GTrip.kt
+++ b/src/main/java/org/mtransit/parser/gtfs/data/GTrip.kt
@@ -6,7 +6,6 @@ import org.mtransit.commons.gtfs.data.Trip
 import org.mtransit.parser.MTLog
 import org.mtransit.parser.gtfs.GAgencyTools
 
-// https://developers.google.com/transit/gtfs/reference#tripstxt
 // https://gtfs.org/reference/static/#tripstxt
 data class GTrip(
     val tripIdInt: Int,