diff --git a/internal/backend/basicstation/structs/join_request_test.go b/internal/backend/basicstation/structs/join_request_test.go
index b4a5930d..20dc8177 100644
--- a/internal/backend/basicstation/structs/join_request_test.go
+++ b/internal/backend/basicstation/structs/join_request_test.go
@@ -61,7 +61,7 @@ func TestJoinRequestToProto(t *testing.T) {
 		},
 		RxInfo: &gw.UplinkRxInfo{
 			GatewayId:         "0102030405060708",
-			Time:              pTime,
+			GwTime:            pTime,
 			TimeSinceGpsEpoch: durationpb.New(5 * time.Second),
 			Rssi:              120,
 			Snr:               5.5,
diff --git a/internal/backend/basicstation/structs/radio_meta_data_test.go b/internal/backend/basicstation/structs/radio_meta_data_test.go
index abefb85e..bff9b650 100644
--- a/internal/backend/basicstation/structs/radio_meta_data_test.go
+++ b/internal/backend/basicstation/structs/radio_meta_data_test.go
@@ -121,7 +121,7 @@ func TestSetRadioMetaDataToProto(t *testing.T) {
 					Snr:               5.5,
 					Context:           []byte{0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02},
 					TimeSinceGpsEpoch: durationpb.New(5 * time.Second),
-					Time:              timeP,
+					GwTime:            timeP,
 					CrcStatus:         gw.CRCStatus_CRC_OK,
 				},
 			},
diff --git a/internal/backend/semtechudp/backend_test.go b/internal/backend/semtechudp/backend_test.go
index 6414d1a2..96f95d10 100644
--- a/internal/backend/semtechudp/backend_test.go
+++ b/internal/backend/semtechudp/backend_test.go
@@ -767,7 +767,7 @@ func (ts *BackendTestSuite) TestPushData() {
 					},
 					RxInfo: &gw.UplinkRxInfo{
 						GatewayId:         "0102030405060708",
-						Time:              nowPB,
+						GwTime:            nowPB,
 						TimeSinceGpsEpoch: durationpb.New(time.Second),
 						Rssi:              -51,
 						Snr:               7,
diff --git a/internal/backend/semtechudp/packets/push_data_test.go b/internal/backend/semtechudp/packets/push_data_test.go
index 24c68d42..5e73312c 100644
--- a/internal/backend/semtechudp/packets/push_data_test.go
+++ b/internal/backend/semtechudp/packets/push_data_test.go
@@ -262,7 +262,7 @@ func TestGetUplinkFrame(t *testing.T) {
 					},
 					RxInfo: &gw.UplinkRxInfo{
 						GatewayId:         "0102030405060708",
-						Time:              pbTime,
+						GwTime:            pbTime,
 						TimeSinceGpsEpoch: durationpb.New(10 * time.Minute),
 						Rssi:              -60,
 						Snr:               5.5,
@@ -337,7 +337,7 @@ func TestGetUplinkFrame(t *testing.T) {
 					},
 					RxInfo: &gw.UplinkRxInfo{
 						GatewayId:         "0102030405060708",
-						Time:              pbTime,
+						GwTime:            pbTime,
 						TimeSinceGpsEpoch: durationpb.New(10 * time.Minute),
 						Rssi:              -70,
 						Snr:               6.6,
@@ -366,7 +366,7 @@ func TestGetUplinkFrame(t *testing.T) {
 					},
 					RxInfo: &gw.UplinkRxInfo{
 						GatewayId:         "0102030405060708",
-						Time:              pbTime,
+						GwTime:            pbTime,
 						TimeSinceGpsEpoch: durationpb.New(10 * time.Minute),
 						Rssi:              -80,
 						Snr:               7.7,
@@ -476,7 +476,7 @@ func TestGetUplinkFrame(t *testing.T) {
 					},
 					RxInfo: &gw.UplinkRxInfo{
 						GatewayId:             "0102030405060708",
-						Time:                  pbTime,
+						GwTime:                pbTime,
 						TimeSinceGpsEpoch:     durationpb.New(10 * time.Minute),
 						FineTimeSinceGpsEpoch: ft,
 						Rssi:                  -60,
@@ -538,7 +538,7 @@ func TestGetUplinkFrame(t *testing.T) {
 					},
 					RxInfo: &gw.UplinkRxInfo{
 						GatewayId: "0102030405060708",
-						Time:      pbTime,
+						GwTime:    pbTime,
 						Rssi:      -60,
 						Snr:       5.5,
 						Channel:   1,
@@ -603,7 +603,7 @@ func TestGetUplinkFrame(t *testing.T) {
 					},
 					RxInfo: &gw.UplinkRxInfo{
 						GatewayId: "0102030405060708",
-						Time:      pbTime,
+						GwTime:    pbTime,
 						Rssi:      -60,
 						Snr:       5.5,
 						Channel:   1,