diff --git a/.github/workflows/aggregate_signals.yml b/.github/workflows/aggregate_signals.yml
index 20a1041..c64e802 100644
--- a/.github/workflows/aggregate_signals.yml
+++ b/.github/workflows/aggregate_signals.yml
@@ -42,7 +42,7 @@ jobs:
       run: sudo apt update && sudo apt-get install clang -y
 
     - name: Validate Aggregated Signals
-      run: .github/scripts/validate.rs registry.json
+      run: .github/scripts/validate.rs registry/registry.json
 
     - name: Commit
       uses: stefanzweifel/git-auto-commit-action@v5
diff --git a/signals/CS/1INCH-USD.yaml b/signals/CS/1INCH-USD.yaml
index 0816b56..bc7843a 100644
--- a/signals/CS/1INCH-USD.yaml
+++ b/signals/CS/1INCH-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: 1INCHUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: 1INCH-USD
diff --git a/signals/CS/AAVE-USD.yaml b/signals/CS/AAVE-USD.yaml
index 0ac3a46..f20be2c 100644
--- a/signals/CS/AAVE-USD.yaml
+++ b/signals/CS/AAVE-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: AAVEUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: AAVE-USD
diff --git a/signals/CS/ADA-USD.yaml b/signals/CS/ADA-USD.yaml
index 24abd31..0064c81 100644
--- a/signals/CS/ADA-USD.yaml
+++ b/signals/CS/ADA-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: ADAUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: ADAUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: ADA-USD
@@ -37,7 +37,7 @@ sources:
 - source_id: kraken
   id: ADA/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: ADA-USDC
diff --git a/signals/CS/AEVO-USD.yaml b/signals/CS/AEVO-USD.yaml
index 4c9fe7d..60d8e05 100644
--- a/signals/CS/AEVO-USD.yaml
+++ b/signals/CS/AEVO-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: AEVOUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: aevo-exchange
diff --git a/signals/CS/AIOZ-USD.yaml b/signals/CS/AIOZ-USD.yaml
index c4b94bc..e7da04d 100644
--- a/signals/CS/AIOZ-USD.yaml
+++ b/signals/CS/AIOZ-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: AIOZUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: AIOZ-USD
diff --git a/signals/CS/ALGO-USD.yaml b/signals/CS/ALGO-USD.yaml
index c90a9e8..99ab842 100644
--- a/signals/CS/ALGO-USD.yaml
+++ b/signals/CS/ALGO-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: ALGOUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: ALGO-USD
@@ -27,7 +27,7 @@ sources:
 - source_id: kraken
   id: ALGO/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: ALGO-USDC
diff --git a/signals/CS/ALT-USD.yaml b/signals/CS/ALT-USD.yaml
index b1a1314..e7fd976 100644
--- a/signals/CS/ALT-USD.yaml
+++ b/signals/CS/ALT-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: ALTUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: altlayer
diff --git a/signals/CS/ANKR-USD.yaml b/signals/CS/ANKR-USD.yaml
index 8f91fce..cada9bb 100644
--- a/signals/CS/ANKR-USD.yaml
+++ b/signals/CS/ANKR-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: ANKRUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: ANKR-USD
diff --git a/signals/CS/APE-USD.yaml b/signals/CS/APE-USD.yaml
index d4f0295..fff6bec 100644
--- a/signals/CS/APE-USD.yaml
+++ b/signals/CS/APE-USD.yaml
@@ -7,12 +7,12 @@ sources:
 - source_id: bybit
   id: APEUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: APEUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: APE-USD
@@ -32,7 +32,7 @@ sources:
 - source_id: kraken
   id: APE/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: APE-USDC
diff --git a/signals/CS/APT-USD.yaml b/signals/CS/APT-USD.yaml
index cabfdbe..97369bd 100644
--- a/signals/CS/APT-USD.yaml
+++ b/signals/CS/APT-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: APTUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: APTUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: APT-USD
diff --git a/signals/CS/AR-USD.yaml b/signals/CS/AR-USD.yaml
index f6fb7e8..b74c103 100644
--- a/signals/CS/AR-USD.yaml
+++ b/signals/CS/AR-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: ARUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: arweave
diff --git a/signals/CS/ARB-USD.yaml b/signals/CS/ARB-USD.yaml
index 8755d5a..999bea1 100644
--- a/signals/CS/ARB-USD.yaml
+++ b/signals/CS/ARB-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: ARBUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: ARBUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: ARB-USD
diff --git a/signals/CS/ARKM-USD.yaml b/signals/CS/ARKM-USD.yaml
index 7ca287d..ec255d2 100644
--- a/signals/CS/ARKM-USD.yaml
+++ b/signals/CS/ARKM-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: ARKMUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: ARKM-USD
diff --git a/signals/CS/ATH-USD.yaml b/signals/CS/ATH-USD.yaml
index 3d7d83a..c3a92ad 100644
--- a/signals/CS/ATH-USD.yaml
+++ b/signals/CS/ATH-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: ATHUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinmarketcap
   id: '30083'
diff --git a/signals/CS/ATOM-USD.yaml b/signals/CS/ATOM-USD.yaml
index b594858..b4ab752 100644
--- a/signals/CS/ATOM-USD.yaml
+++ b/signals/CS/ATOM-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: ATOMUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: ATOMUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: ATOM-USD
@@ -37,7 +37,7 @@ sources:
 - source_id: kraken
   id: ATOM/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: ATOM-USDC
diff --git a/signals/CS/AVAIL-USD.yaml b/signals/CS/AVAIL-USD.yaml
index d010eb7..9a77c05 100644
--- a/signals/CS/AVAIL-USD.yaml
+++ b/signals/CS/AVAIL-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: AVAILUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: avail
diff --git a/signals/CS/AVAX-USD.yaml b/signals/CS/AVAX-USD.yaml
index 239f552..798bb84 100644
--- a/signals/CS/AVAX-USD.yaml
+++ b/signals/CS/AVAX-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: AVAXUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: AVAXUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: AVAX-USD
@@ -37,7 +37,7 @@ sources:
 - source_id: kraken
   id: AVAX/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: AVAX-USDC
diff --git a/signals/CS/AXL-USD.yaml b/signals/CS/AXL-USD.yaml
index 36796c2..6a0c4c4 100644
--- a/signals/CS/AXL-USD.yaml
+++ b/signals/CS/AXL-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: AXLUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: AXL-USD
diff --git a/signals/CS/AXS-USD.yaml b/signals/CS/AXS-USD.yaml
index 06b7499..a3ff232 100644
--- a/signals/CS/AXS-USD.yaml
+++ b/signals/CS/AXS-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: AXSUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: AXS-USD
diff --git a/signals/CS/BAT-USD.yaml b/signals/CS/BAT-USD.yaml
index 566ac0d..32993d1 100644
--- a/signals/CS/BAT-USD.yaml
+++ b/signals/CS/BAT-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: BATUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: BAT-USD
diff --git a/signals/CS/BCH-USD.yaml b/signals/CS/BCH-USD.yaml
index 810a4f2..8168e3d 100644
--- a/signals/CS/BCH-USD.yaml
+++ b/signals/CS/BCH-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: BCHUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: BCHUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: BCH-USD
@@ -32,7 +32,7 @@ sources:
 - source_id: kraken
   id: BCH/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: BCH-USDC
diff --git a/signals/CS/BEAM-USD.yaml b/signals/CS/BEAM-USD.yaml
index 0547e3a..c97fe82 100644
--- a/signals/CS/BEAM-USD.yaml
+++ b/signals/CS/BEAM-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: BEAMUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: beam-2
diff --git a/signals/CS/BICO-USD.yaml b/signals/CS/BICO-USD.yaml
index b9d4999..4619d66 100644
--- a/signals/CS/BICO-USD.yaml
+++ b/signals/CS/BICO-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: BICOUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: BICO-USD
diff --git a/signals/CS/BLAST-USD.yaml b/signals/CS/BLAST-USD.yaml
index 003c150..3bdd3cb 100644
--- a/signals/CS/BLAST-USD.yaml
+++ b/signals/CS/BLAST-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: BLASTUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: BLAST-USD
diff --git a/signals/CS/BLUR-USD.yaml b/signals/CS/BLUR-USD.yaml
index f79677c..f93a16c 100644
--- a/signals/CS/BLUR-USD.yaml
+++ b/signals/CS/BLUR-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: BLURUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: BLUR-USD
diff --git a/signals/CS/BNB-USD.yaml b/signals/CS/BNB-USD.yaml
index ed59257..ec55005 100644
--- a/signals/CS/BNB-USD.yaml
+++ b/signals/CS/BNB-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: BNBUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: BNBUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: binancecoin
diff --git a/signals/CS/BOME-USD.yaml b/signals/CS/BOME-USD.yaml
index b32e403..7589f85 100644
--- a/signals/CS/BOME-USD.yaml
+++ b/signals/CS/BOME-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: BOMEUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: book-of-meme
diff --git a/signals/CS/BONK-USD.yaml b/signals/CS/BONK-USD.yaml
index 59aaef8..9586338 100644
--- a/signals/CS/BONK-USD.yaml
+++ b/signals/CS/BONK-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: BONKUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: BONKUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: BONK-USD
diff --git a/signals/CS/BRETT-USD.yaml b/signals/CS/BRETT-USD.yaml
index bf7c5b5..d4a7c50 100644
--- a/signals/CS/BRETT-USD.yaml
+++ b/signals/CS/BRETT-USD.yaml
@@ -2,12 +2,12 @@ sources:
 - source_id: bybit
   id: BRETTUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: BRETTUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: based-brett
diff --git a/signals/CS/BTC-USD.yaml b/signals/CS/BTC-USD.yaml
index 7539e75..1494e56 100644
--- a/signals/CS/BTC-USD.yaml
+++ b/signals/CS/BTC-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: BTCUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: BTCUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: BTC-USD
@@ -37,12 +37,12 @@ sources:
 - source_id: kraken
   id: BTC/USDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: kraken
   id: BTC/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: BTC-USDC
diff --git a/signals/CS/BTG-USD.yaml b/signals/CS/BTG-USD.yaml
index 5d2a53c..c8a7283 100644
--- a/signals/CS/BTG-USD.yaml
+++ b/signals/CS/BTG-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: BTGUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: bitcoin-gold
diff --git a/signals/CS/BTT-USD.yaml b/signals/CS/BTT-USD.yaml
index c084d4f..8678156 100644
--- a/signals/CS/BTT-USD.yaml
+++ b/signals/CS/BTT-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: BTTUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: bittorrent
diff --git a/signals/CS/CAKE-USD.yaml b/signals/CS/CAKE-USD.yaml
index df03299..496888f 100644
--- a/signals/CS/CAKE-USD.yaml
+++ b/signals/CS/CAKE-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: CAKEUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: pancakeswap-token
diff --git a/signals/CS/CAT-USD.yaml b/signals/CS/CAT-USD.yaml
index bbb8433..642d80b 100644
--- a/signals/CS/CAT-USD.yaml
+++ b/signals/CS/CAT-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: CATUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinmarketcap
   id: '32724'
diff --git a/signals/CS/CELO-USD.yaml b/signals/CS/CELO-USD.yaml
index 2e322f6..5012d72 100644
--- a/signals/CS/CELO-USD.yaml
+++ b/signals/CS/CELO-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: CELOUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: celo
diff --git a/signals/CS/CHZ-USD.yaml b/signals/CS/CHZ-USD.yaml
index b0ed443..6c08204 100644
--- a/signals/CS/CHZ-USD.yaml
+++ b/signals/CS/CHZ-USD.yaml
@@ -7,12 +7,12 @@ sources:
 - source_id: bybit
   id: CHZUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: CHZUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: CHZ-USD
diff --git a/signals/CS/COMP-USD.yaml b/signals/CS/COMP-USD.yaml
index 1cce184..316d2e2 100644
--- a/signals/CS/COMP-USD.yaml
+++ b/signals/CS/COMP-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: COMPUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: COMP-USD
diff --git a/signals/CS/CORE-USD.yaml b/signals/CS/CORE-USD.yaml
index faf3861..1a2385f 100644
--- a/signals/CS/CORE-USD.yaml
+++ b/signals/CS/CORE-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: COREUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: coredaoorg
diff --git a/signals/CS/CRV-USD.yaml b/signals/CS/CRV-USD.yaml
index f08f41f..5cfcf40 100644
--- a/signals/CS/CRV-USD.yaml
+++ b/signals/CS/CRV-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: CRVUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: CRV-USD
diff --git a/signals/CS/DCR-USD.yaml b/signals/CS/DCR-USD.yaml
index 5969033..ef6a681 100644
--- a/signals/CS/DCR-USD.yaml
+++ b/signals/CS/DCR-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: DCRUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinmarketcap
   id: '1168'
diff --git a/signals/CS/DOGE-USD.yaml b/signals/CS/DOGE-USD.yaml
index ccb4fbe..495bd99 100644
--- a/signals/CS/DOGE-USD.yaml
+++ b/signals/CS/DOGE-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: DOGEUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: DOGEUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: DOGE-USD
@@ -37,7 +37,7 @@ sources:
 - source_id: kraken
   id: DOGE/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: DOGE-USDC
diff --git a/signals/CS/DOGS-USD.yaml b/signals/CS/DOGS-USD.yaml
index 47f6d7a..91a8d20 100644
--- a/signals/CS/DOGS-USD.yaml
+++ b/signals/CS/DOGS-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: DOGSUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: DOGSUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: dogs-2
diff --git a/signals/CS/DOT-USD.yaml b/signals/CS/DOT-USD.yaml
index 098f4b0..e80647c 100644
--- a/signals/CS/DOT-USD.yaml
+++ b/signals/CS/DOT-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: DOTUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: DOTUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: DOT-USD
@@ -37,7 +37,7 @@ sources:
 - source_id: kraken
   id: DOT/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: DOT-USDC
diff --git a/signals/CS/DYDX-USD.yaml b/signals/CS/DYDX-USD.yaml
index 0814e4b..ee048cf 100644
--- a/signals/CS/DYDX-USD.yaml
+++ b/signals/CS/DYDX-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: DYDXUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: dydx-chain
diff --git a/signals/CS/DYM-USD.yaml b/signals/CS/DYM-USD.yaml
index 034449e..a333a27 100644
--- a/signals/CS/DYM-USD.yaml
+++ b/signals/CS/DYM-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: DYMUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: dymension
diff --git a/signals/CS/EGLD-USD.yaml b/signals/CS/EGLD-USD.yaml
index 1a87695..7fb425b 100644
--- a/signals/CS/EGLD-USD.yaml
+++ b/signals/CS/EGLD-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: EGLDUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: EGLD-USD
diff --git a/signals/CS/EIGEN-USD.yaml b/signals/CS/EIGEN-USD.yaml
index febf0af..78a60e9 100644
--- a/signals/CS/EIGEN-USD.yaml
+++ b/signals/CS/EIGEN-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: EIGENUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: EIGEN-USD
diff --git a/signals/CS/ENA-USD.yaml b/signals/CS/ENA-USD.yaml
index a10655d..31c2216 100644
--- a/signals/CS/ENA-USD.yaml
+++ b/signals/CS/ENA-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: ENAUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: ethena
diff --git a/signals/CS/ENJ-USD.yaml b/signals/CS/ENJ-USD.yaml
index 6418576..5fb240d 100644
--- a/signals/CS/ENJ-USD.yaml
+++ b/signals/CS/ENJ-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: ENJUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: enjincoin
diff --git a/signals/CS/ENS-USD.yaml b/signals/CS/ENS-USD.yaml
index 9d66711..82dbfd6 100644
--- a/signals/CS/ENS-USD.yaml
+++ b/signals/CS/ENS-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: ENSUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: ENS-USD
diff --git a/signals/CS/EOS-USD.yaml b/signals/CS/EOS-USD.yaml
index d4af6f1..bb9fa68 100644
--- a/signals/CS/EOS-USD.yaml
+++ b/signals/CS/EOS-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: EOSUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: EOSUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: EOS-USD
@@ -32,7 +32,7 @@ sources:
 - source_id: kraken
   id: EOS/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: EOS-USDC
diff --git a/signals/CS/ETC-USD.yaml b/signals/CS/ETC-USD.yaml
index 3d405cd..545d10c 100644
--- a/signals/CS/ETC-USD.yaml
+++ b/signals/CS/ETC-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: ETCUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: ETC-USD
diff --git a/signals/CS/ETH-USD.yaml b/signals/CS/ETH-USD.yaml
index e507ea5..72ea806 100644
--- a/signals/CS/ETH-USD.yaml
+++ b/signals/CS/ETH-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: ETHUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: ETHUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: ETH-USD
@@ -37,12 +37,12 @@ sources:
 - source_id: kraken
   id: ETH/USDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: kraken
   id: ETH/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: ETH-USDC
diff --git a/signals/CS/ETHFI-USD.yaml b/signals/CS/ETHFI-USD.yaml
index f525d01..8b0d9c6 100644
--- a/signals/CS/ETHFI-USD.yaml
+++ b/signals/CS/ETHFI-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: ETHFIUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: ether-fi
diff --git a/signals/CS/ETHW-USD.yaml b/signals/CS/ETHW-USD.yaml
index 2ad4f48..2a17d3e 100644
--- a/signals/CS/ETHW-USD.yaml
+++ b/signals/CS/ETHW-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: ETHWUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: ethereum-pow-iou
diff --git a/signals/CS/FET-USD.yaml b/signals/CS/FET-USD.yaml
index d01f290..9af58cf 100644
--- a/signals/CS/FET-USD.yaml
+++ b/signals/CS/FET-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: FETUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: FETUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: FET-USD
diff --git a/signals/CS/FIL-USD.yaml b/signals/CS/FIL-USD.yaml
index ace0caf..3583198 100644
--- a/signals/CS/FIL-USD.yaml
+++ b/signals/CS/FIL-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: FILUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: FILUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: FIL-USD
diff --git a/signals/CS/FLOKI-USD.yaml b/signals/CS/FLOKI-USD.yaml
index c1cf841..63a437a 100644
--- a/signals/CS/FLOKI-USD.yaml
+++ b/signals/CS/FLOKI-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: FLOKIUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: FLOKIUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: floki
diff --git a/signals/CS/FLOW-USD.yaml b/signals/CS/FLOW-USD.yaml
index a497127..f07b0df 100644
--- a/signals/CS/FLOW-USD.yaml
+++ b/signals/CS/FLOW-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: FLOWUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: FLOW-USD
diff --git a/signals/CS/FLR-USD.yaml b/signals/CS/FLR-USD.yaml
index 1b32618..5ab5681 100644
--- a/signals/CS/FLR-USD.yaml
+++ b/signals/CS/FLR-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: FLRUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: FLR-USD
diff --git a/signals/CS/FTM-USD.yaml b/signals/CS/FTM-USD.yaml
index 46a128b..21b34cc 100644
--- a/signals/CS/FTM-USD.yaml
+++ b/signals/CS/FTM-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: FTMUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: FTMUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: fantom
diff --git a/signals/CS/FTT-USD.yaml b/signals/CS/FTT-USD.yaml
index 98fc80c..bc1430e 100644
--- a/signals/CS/FTT-USD.yaml
+++ b/signals/CS/FTT-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: FTTUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinmarketcap
   id: '4195'
diff --git a/signals/CS/G-USD.yaml b/signals/CS/G-USD.yaml
index ededbda..ea3d70e 100644
--- a/signals/CS/G-USD.yaml
+++ b/signals/CS/G-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: GUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: G-USD
diff --git a/signals/CS/GALA-USD.yaml b/signals/CS/GALA-USD.yaml
index b82b26b..b320615 100644
--- a/signals/CS/GALA-USD.yaml
+++ b/signals/CS/GALA-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: GALAUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: gala
diff --git a/signals/CS/GMT-USD.yaml b/signals/CS/GMT-USD.yaml
index ab0c5fe..4c9580b 100644
--- a/signals/CS/GMT-USD.yaml
+++ b/signals/CS/GMT-USD.yaml
@@ -7,12 +7,12 @@ sources:
 - source_id: bybit
   id: GMTUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: GMTUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: GMT-USD
diff --git a/signals/CS/GMX-USD.yaml b/signals/CS/GMX-USD.yaml
index 5e9fda8..bf558da 100644
--- a/signals/CS/GMX-USD.yaml
+++ b/signals/CS/GMX-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: GMXUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinmarketcap
   id: '11857'
diff --git a/signals/CS/GRT-USD.yaml b/signals/CS/GRT-USD.yaml
index 18dadda..22b5eab 100644
--- a/signals/CS/GRT-USD.yaml
+++ b/signals/CS/GRT-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: GRTUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: GRT-USD
diff --git a/signals/CS/HBAR-USD.yaml b/signals/CS/HBAR-USD.yaml
index 377da9e..b784f4d 100644
--- a/signals/CS/HBAR-USD.yaml
+++ b/signals/CS/HBAR-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: HBARUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: HBAR-USD
diff --git a/signals/CS/HMSTR-USD.yaml b/signals/CS/HMSTR-USD.yaml
index 2f8c3c1..869c503 100644
--- a/signals/CS/HMSTR-USD.yaml
+++ b/signals/CS/HMSTR-USD.yaml
@@ -7,12 +7,12 @@ sources:
 - source_id: bybit
   id: HMSTRUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: HMSTRUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: hamster-kombat
diff --git a/signals/CS/HNT-USD.yaml b/signals/CS/HNT-USD.yaml
index c594a49..3b6bdc4 100644
--- a/signals/CS/HNT-USD.yaml
+++ b/signals/CS/HNT-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: HNTUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: HNT-USD
diff --git a/signals/CS/HOT-USD.yaml b/signals/CS/HOT-USD.yaml
index 111c892..4c55b43 100644
--- a/signals/CS/HOT-USD.yaml
+++ b/signals/CS/HOT-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: HOTUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: holotoken
diff --git a/signals/CS/ICP-USD.yaml b/signals/CS/ICP-USD.yaml
index fe65300..ad9b1bc 100644
--- a/signals/CS/ICP-USD.yaml
+++ b/signals/CS/ICP-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: ICPUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: ICPUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: ICP-USD
diff --git a/signals/CS/ID-USD.yaml b/signals/CS/ID-USD.yaml
index 3b25b9c..77490be 100644
--- a/signals/CS/ID-USD.yaml
+++ b/signals/CS/ID-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: IDUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinmarketcap
   id: '21846'
diff --git a/signals/CS/IMX-USD.yaml b/signals/CS/IMX-USD.yaml
index 7f8fcaf..cd57f9b 100644
--- a/signals/CS/IMX-USD.yaml
+++ b/signals/CS/IMX-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: IMXUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: IMX-USD
diff --git a/signals/CS/INJ-USD.yaml b/signals/CS/INJ-USD.yaml
index c4920ba..170c42c 100644
--- a/signals/CS/INJ-USD.yaml
+++ b/signals/CS/INJ-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: INJUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: INJUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: INJ-USD
diff --git a/signals/CS/IO-USD.yaml b/signals/CS/IO-USD.yaml
index 3066e70..45d032a 100644
--- a/signals/CS/IO-USD.yaml
+++ b/signals/CS/IO-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: IOUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinmarketcap
   id: '29835'
diff --git a/signals/CS/JASMY-USD.yaml b/signals/CS/JASMY-USD.yaml
index 418e711..bea0e7b 100644
--- a/signals/CS/JASMY-USD.yaml
+++ b/signals/CS/JASMY-USD.yaml
@@ -7,12 +7,12 @@ sources:
 - source_id: bybit
   id: JASMYUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: JASMYUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: JASMY-USD
diff --git a/signals/CS/JST-USD.yaml b/signals/CS/JST-USD.yaml
index 3b0ebd8..4e478cd 100644
--- a/signals/CS/JST-USD.yaml
+++ b/signals/CS/JST-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: JSTUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: just
diff --git a/signals/CS/JTO-USD.yaml b/signals/CS/JTO-USD.yaml
index 5653855..f1dbd02 100644
--- a/signals/CS/JTO-USD.yaml
+++ b/signals/CS/JTO-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: JTOUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: JTO-USD
diff --git a/signals/CS/JUP-USD.yaml b/signals/CS/JUP-USD.yaml
index 457c2ec..8ad2796 100644
--- a/signals/CS/JUP-USD.yaml
+++ b/signals/CS/JUP-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: JUPUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: jupiter-exchange-solana
diff --git a/signals/CS/KAS-USD.yaml b/signals/CS/KAS-USD.yaml
index 70fd6d0..e27ecc7 100644
--- a/signals/CS/KAS-USD.yaml
+++ b/signals/CS/KAS-USD.yaml
@@ -2,12 +2,12 @@ sources:
 - source_id: bybit
   id: KASUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: KASUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: kaspa
diff --git a/signals/CS/KAVA-USD.yaml b/signals/CS/KAVA-USD.yaml
index ee40803..b2e5937 100644
--- a/signals/CS/KAVA-USD.yaml
+++ b/signals/CS/KAVA-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: KAVAUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: KAVA-USD
diff --git a/signals/CS/KCS-USD.yaml b/signals/CS/KCS-USD.yaml
index 24eec80..ad18f24 100644
--- a/signals/CS/KCS-USD.yaml
+++ b/signals/CS/KCS-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: KCSUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: kucoin-shares
diff --git a/signals/CS/KLAY-USD.yaml b/signals/CS/KLAY-USD.yaml
index 1f77618..6fc4a5a 100644
--- a/signals/CS/KLAY-USD.yaml
+++ b/signals/CS/KLAY-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: KLAYUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: klay-token
diff --git a/signals/CS/KSM-USD.yaml b/signals/CS/KSM-USD.yaml
index ce471fe..113d591 100644
--- a/signals/CS/KSM-USD.yaml
+++ b/signals/CS/KSM-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: KSMUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: KSM-USD
diff --git a/signals/CS/LDO-USD.yaml b/signals/CS/LDO-USD.yaml
index 73153a1..fa2f3b6 100644
--- a/signals/CS/LDO-USD.yaml
+++ b/signals/CS/LDO-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: LDOUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: LDOUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: LDO-USD
diff --git a/signals/CS/LINK-USD.yaml b/signals/CS/LINK-USD.yaml
index bd20378..bb36794 100644
--- a/signals/CS/LINK-USD.yaml
+++ b/signals/CS/LINK-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: LINKUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: LINKUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: LINK-USD
@@ -37,7 +37,7 @@ sources:
 - source_id: kraken
   id: LINK/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: LINK-USDC
diff --git a/signals/CS/LTC-USD.yaml b/signals/CS/LTC-USD.yaml
index bd2b62f..9bca1d6 100644
--- a/signals/CS/LTC-USD.yaml
+++ b/signals/CS/LTC-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: LTCUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: LTCUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: LTC-USD
@@ -32,7 +32,7 @@ sources:
 - source_id: kraken
   id: LTC/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: LTC-USDC
diff --git a/signals/CS/LUNA-USD.yaml b/signals/CS/LUNA-USD.yaml
index ae350e5..8a283a3 100644
--- a/signals/CS/LUNA-USD.yaml
+++ b/signals/CS/LUNA-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: LUNAUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: terra-luna-2
diff --git a/signals/CS/LUNC-USD.yaml b/signals/CS/LUNC-USD.yaml
index 6a419e1..e875267 100644
--- a/signals/CS/LUNC-USD.yaml
+++ b/signals/CS/LUNC-USD.yaml
@@ -7,12 +7,12 @@ sources:
 - source_id: bybit
   id: LUNCUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: LUNCUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: terra-luna
diff --git a/signals/CS/MANA-USD.yaml b/signals/CS/MANA-USD.yaml
index ea90c6d..3116055 100644
--- a/signals/CS/MANA-USD.yaml
+++ b/signals/CS/MANA-USD.yaml
@@ -7,12 +7,12 @@ sources:
 - source_id: bybit
   id: MANAUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: MANAUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: MANA-USD
@@ -27,7 +27,7 @@ sources:
 - source_id: kraken
   id: MANA/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: MANA-USDC
diff --git a/signals/CS/MANTA-USD.yaml b/signals/CS/MANTA-USD.yaml
index 639869e..3ce5f2a 100644
--- a/signals/CS/MANTA-USD.yaml
+++ b/signals/CS/MANTA-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: MANTAUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: manta-network
diff --git a/signals/CS/MASK-USD.yaml b/signals/CS/MASK-USD.yaml
index 30aeb00..c6d9827 100644
--- a/signals/CS/MASK-USD.yaml
+++ b/signals/CS/MASK-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: MASKUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: MASK-USD
diff --git a/signals/CS/MATIC-USD.yaml b/signals/CS/MATIC-USD.yaml
index 47e2aed..891bee4 100644
--- a/signals/CS/MATIC-USD.yaml
+++ b/signals/CS/MATIC-USD.yaml
@@ -17,5 +17,5 @@ sources:
 - source_id: kraken
   id: MATIC/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
diff --git a/signals/CS/MEME-USD.yaml b/signals/CS/MEME-USD.yaml
index 6b454f9..a043aa3 100644
--- a/signals/CS/MEME-USD.yaml
+++ b/signals/CS/MEME-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: MEMEUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: memecoin-2
diff --git a/signals/CS/MEW-USD.yaml b/signals/CS/MEW-USD.yaml
index 1ce7298..164dc6b 100644
--- a/signals/CS/MEW-USD.yaml
+++ b/signals/CS/MEW-USD.yaml
@@ -2,12 +2,12 @@ sources:
 - source_id: bybit
   id: MEWUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: MEWUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: cat-in-a-dogs-world
diff --git a/signals/CS/MINA-USD.yaml b/signals/CS/MINA-USD.yaml
index 0ff5a8d..c2ed745 100644
--- a/signals/CS/MINA-USD.yaml
+++ b/signals/CS/MINA-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: MINAUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: MINA-USD
diff --git a/signals/CS/MKR-USD.yaml b/signals/CS/MKR-USD.yaml
index d51e0cd..2b07e31 100644
--- a/signals/CS/MKR-USD.yaml
+++ b/signals/CS/MKR-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: MKRUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: MKR-USD
diff --git a/signals/CS/MNT-USD.yaml b/signals/CS/MNT-USD.yaml
index 1014caa..7b7ecb5 100644
--- a/signals/CS/MNT-USD.yaml
+++ b/signals/CS/MNT-USD.yaml
@@ -2,12 +2,12 @@ sources:
 - source_id: bybit
   id: MNTUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: MNTUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: mantle
diff --git a/signals/CS/MOG-USD.yaml b/signals/CS/MOG-USD.yaml
index 8fc0994..b6dc4e0 100644
--- a/signals/CS/MOG-USD.yaml
+++ b/signals/CS/MOG-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: MOGUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: mog-coin
diff --git a/signals/CS/MX-USD.yaml b/signals/CS/MX-USD.yaml
index 072c6b4..f5311b8 100644
--- a/signals/CS/MX-USD.yaml
+++ b/signals/CS/MX-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: MXUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: mx-token
diff --git a/signals/CS/NEAR-USD.yaml b/signals/CS/NEAR-USD.yaml
index 0f289f9..7fe834c 100644
--- a/signals/CS/NEAR-USD.yaml
+++ b/signals/CS/NEAR-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: NEARUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: NEARUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: NEAR-USD
diff --git a/signals/CS/NEIRO-USD.yaml b/signals/CS/NEIRO-USD.yaml
index b79679a..4dc2b48 100644
--- a/signals/CS/NEIRO-USD.yaml
+++ b/signals/CS/NEIRO-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: NEIROUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: neiro-3
diff --git a/signals/CS/NEXO-USD.yaml b/signals/CS/NEXO-USD.yaml
index 2d5f2a5..274e9a1 100644
--- a/signals/CS/NEXO-USD.yaml
+++ b/signals/CS/NEXO-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: NEXOUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: nexo
diff --git a/signals/CS/NFT-USD.yaml b/signals/CS/NFT-USD.yaml
index 0042f68..1b8e40b 100644
--- a/signals/CS/NFT-USD.yaml
+++ b/signals/CS/NFT-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: NFTUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: apenft
diff --git a/signals/CS/NOT-USD.yaml b/signals/CS/NOT-USD.yaml
index 53125ee..65306b9 100644
--- a/signals/CS/NOT-USD.yaml
+++ b/signals/CS/NOT-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: NOTUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: NOTUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: notcoin
diff --git a/signals/CS/ONDO-USD.yaml b/signals/CS/ONDO-USD.yaml
index 50c512c..5fb1b6f 100644
--- a/signals/CS/ONDO-USD.yaml
+++ b/signals/CS/ONDO-USD.yaml
@@ -2,12 +2,12 @@ sources:
 - source_id: bybit
   id: ONDOUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: ONDOUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: ONDO-USD
diff --git a/signals/CS/ONE-USD.yaml b/signals/CS/ONE-USD.yaml
index 973f4cc..2e06f97 100644
--- a/signals/CS/ONE-USD.yaml
+++ b/signals/CS/ONE-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: ONEUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinmarketcap
   id: '3945'
diff --git a/signals/CS/OP-USD.yaml b/signals/CS/OP-USD.yaml
index a3599de..ff68fd6 100644
--- a/signals/CS/OP-USD.yaml
+++ b/signals/CS/OP-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: OPUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: OPUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: OP-USD
diff --git a/signals/CS/ORDI-USD.yaml b/signals/CS/ORDI-USD.yaml
index f7ceaef..0218f75 100644
--- a/signals/CS/ORDI-USD.yaml
+++ b/signals/CS/ORDI-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: ORDIUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: ordinals
diff --git a/signals/CS/PAXG-USD.yaml b/signals/CS/PAXG-USD.yaml
index 8836e26..c7b4978 100644
--- a/signals/CS/PAXG-USD.yaml
+++ b/signals/CS/PAXG-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: PAXGUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: pax-gold
diff --git a/signals/CS/PENDLE-USD.yaml b/signals/CS/PENDLE-USD.yaml
index 6dc9ade..f13c6b6 100644
--- a/signals/CS/PENDLE-USD.yaml
+++ b/signals/CS/PENDLE-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: PENDLEUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: pendle
diff --git a/signals/CS/PEOPLE-USD.yaml b/signals/CS/PEOPLE-USD.yaml
index 6ab01df..60e377d 100644
--- a/signals/CS/PEOPLE-USD.yaml
+++ b/signals/CS/PEOPLE-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: PEOPLEUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: constitutiondao
diff --git a/signals/CS/PEPE-USD.yaml b/signals/CS/PEPE-USD.yaml
index eb43243..f5e9e1d 100644
--- a/signals/CS/PEPE-USD.yaml
+++ b/signals/CS/PEPE-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: PEPEUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: PEPEUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: pepe
diff --git a/signals/CS/POL-USD.yaml b/signals/CS/POL-USD.yaml
index e629e12..a961509 100644
--- a/signals/CS/POL-USD.yaml
+++ b/signals/CS/POL-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: POLUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: POL-USD
diff --git a/signals/CS/POPCAT-USD.yaml b/signals/CS/POPCAT-USD.yaml
index 7147e71..1b72859 100644
--- a/signals/CS/POPCAT-USD.yaml
+++ b/signals/CS/POPCAT-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: POPCATUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: popcat
diff --git a/signals/CS/PRIME-USD.yaml b/signals/CS/PRIME-USD.yaml
index c6a9536..dc2c023 100644
--- a/signals/CS/PRIME-USD.yaml
+++ b/signals/CS/PRIME-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: PRIMEUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: PRIME-USD
diff --git a/signals/CS/PYTH-USD.yaml b/signals/CS/PYTH-USD.yaml
index 2b720de..85bb9cf 100644
--- a/signals/CS/PYTH-USD.yaml
+++ b/signals/CS/PYTH-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: PYTHUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: pyth-network
diff --git a/signals/CS/QNT-USD.yaml b/signals/CS/QNT-USD.yaml
index 0678115..72ad501 100644
--- a/signals/CS/QNT-USD.yaml
+++ b/signals/CS/QNT-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: QNTUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: QNT-USD
diff --git a/signals/CS/QTUM-USD.yaml b/signals/CS/QTUM-USD.yaml
index 1cdee39..2b0228b 100644
--- a/signals/CS/QTUM-USD.yaml
+++ b/signals/CS/QTUM-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: QTUMUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: qtum
diff --git a/signals/CS/RENDER-USD.yaml b/signals/CS/RENDER-USD.yaml
index afaf784..0cad597 100644
--- a/signals/CS/RENDER-USD.yaml
+++ b/signals/CS/RENDER-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: RENDERUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: RENDER-USD
diff --git a/signals/CS/ROSE-USD.yaml b/signals/CS/ROSE-USD.yaml
index 8976de6..0d7f7d5 100644
--- a/signals/CS/ROSE-USD.yaml
+++ b/signals/CS/ROSE-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: ROSEUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: ROSE-USD
diff --git a/signals/CS/RPL-USD.yaml b/signals/CS/RPL-USD.yaml
index e2aecb0..b5771e5 100644
--- a/signals/CS/RPL-USD.yaml
+++ b/signals/CS/RPL-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: RPLUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: RPL-USD
diff --git a/signals/CS/RUNE-USD.yaml b/signals/CS/RUNE-USD.yaml
index 49abb76..66e6da6 100644
--- a/signals/CS/RUNE-USD.yaml
+++ b/signals/CS/RUNE-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: RUNEUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: thorchain
diff --git a/signals/CS/RVN-USD.yaml b/signals/CS/RVN-USD.yaml
index 9b525d5..9e43397 100644
--- a/signals/CS/RVN-USD.yaml
+++ b/signals/CS/RVN-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: RVNUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: ravencoin
diff --git a/signals/CS/SAFE-USD.yaml b/signals/CS/SAFE-USD.yaml
index 771dbcf..c445ceb 100644
--- a/signals/CS/SAFE-USD.yaml
+++ b/signals/CS/SAFE-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: SAFEUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: SAFE-USD
diff --git a/signals/CS/SAND-USD.yaml b/signals/CS/SAND-USD.yaml
index 69723b5..e858629 100644
--- a/signals/CS/SAND-USD.yaml
+++ b/signals/CS/SAND-USD.yaml
@@ -7,12 +7,12 @@ sources:
 - source_id: bybit
   id: SANDUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: SANDUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: SAND-USD
diff --git a/signals/CS/SC-USD.yaml b/signals/CS/SC-USD.yaml
index bf413fc..51ad602 100644
--- a/signals/CS/SC-USD.yaml
+++ b/signals/CS/SC-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: SCUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: siacoin
diff --git a/signals/CS/SEI-USD.yaml b/signals/CS/SEI-USD.yaml
index 173cb8e..84959ae 100644
--- a/signals/CS/SEI-USD.yaml
+++ b/signals/CS/SEI-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: SEIUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: SEIUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: SEI-USD
diff --git a/signals/CS/SHIB-USD.yaml b/signals/CS/SHIB-USD.yaml
index cb1c694..1ef5f45 100644
--- a/signals/CS/SHIB-USD.yaml
+++ b/signals/CS/SHIB-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: SHIBUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: SHIBUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: SHIB-USD
@@ -37,7 +37,7 @@ sources:
 - source_id: kraken
   id: SHIB/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: SHIB-USDC
diff --git a/signals/CS/SNX-USD.yaml b/signals/CS/SNX-USD.yaml
index 77d65c6..5bad3c6 100644
--- a/signals/CS/SNX-USD.yaml
+++ b/signals/CS/SNX-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: SNXUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: SNX-USD
diff --git a/signals/CS/SOL-USD.yaml b/signals/CS/SOL-USD.yaml
index c7f93cc..de7049e 100644
--- a/signals/CS/SOL-USD.yaml
+++ b/signals/CS/SOL-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: SOLUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: SOLUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: SOL-USD
@@ -37,7 +37,7 @@ sources:
 - source_id: kraken
   id: SOL/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: SOL-USDC
diff --git a/signals/CS/SSV-USD.yaml b/signals/CS/SSV-USD.yaml
index 9e1fd54..4c3af8f 100644
--- a/signals/CS/SSV-USD.yaml
+++ b/signals/CS/SSV-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: SSVUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinmarketcap
   id: '12999'
diff --git a/signals/CS/STRK-USD.yaml b/signals/CS/STRK-USD.yaml
index c202bf1..b14b12d 100644
--- a/signals/CS/STRK-USD.yaml
+++ b/signals/CS/STRK-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: STRKUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: STRKUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: STRK-USD
diff --git a/signals/CS/STX-USD.yaml b/signals/CS/STX-USD.yaml
index b7f0b27..31ebf46 100644
--- a/signals/CS/STX-USD.yaml
+++ b/signals/CS/STX-USD.yaml
@@ -12,7 +12,7 @@ sources:
 - source_id: bybit
   id: STXUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: STX-USD
diff --git a/signals/CS/SUI-USD.yaml b/signals/CS/SUI-USD.yaml
index 8934d25..f6e709b 100644
--- a/signals/CS/SUI-USD.yaml
+++ b/signals/CS/SUI-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: SUIUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: SUIUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: SUI-USD
diff --git a/signals/CS/SUN-USD.yaml b/signals/CS/SUN-USD.yaml
index ec48dd9..feb5808 100644
--- a/signals/CS/SUN-USD.yaml
+++ b/signals/CS/SUN-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: SUNUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinmarketcap
   id: '10529'
diff --git a/signals/CS/SUNDOG-USD.yaml b/signals/CS/SUNDOG-USD.yaml
index 3202e96..0bf1491 100644
--- a/signals/CS/SUNDOG-USD.yaml
+++ b/signals/CS/SUNDOG-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: SUNDOGUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: sundog
diff --git a/signals/CS/SUSHI-USD.yaml b/signals/CS/SUSHI-USD.yaml
index 252e0a5..d8def68 100644
--- a/signals/CS/SUSHI-USD.yaml
+++ b/signals/CS/SUSHI-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: SUSHIUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: SUSHI-USD
diff --git a/signals/CS/T-USD.yaml b/signals/CS/T-USD.yaml
index d4ba911..622ce9e 100644
--- a/signals/CS/T-USD.yaml
+++ b/signals/CS/T-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: TUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: T-USD
diff --git a/signals/CS/THETA-USD.yaml b/signals/CS/THETA-USD.yaml
index 97b6d75..aae1a6c 100644
--- a/signals/CS/THETA-USD.yaml
+++ b/signals/CS/THETA-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: THETAUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: theta-token
diff --git a/signals/CS/TIA-USD.yaml b/signals/CS/TIA-USD.yaml
index d2a80cc..3d52acc 100644
--- a/signals/CS/TIA-USD.yaml
+++ b/signals/CS/TIA-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: TIAUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: TIAUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: TIA-USD
diff --git a/signals/CS/TON-USD.yaml b/signals/CS/TON-USD.yaml
index 1cd3ae9..92e091a 100644
--- a/signals/CS/TON-USD.yaml
+++ b/signals/CS/TON-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: TONUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: TONUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: the-open-network
diff --git a/signals/CS/TRX-USD.yaml b/signals/CS/TRX-USD.yaml
index b2ea97d..99316d4 100644
--- a/signals/CS/TRX-USD.yaml
+++ b/signals/CS/TRX-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: TRXUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: TRXUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: tron
diff --git a/signals/CS/TWT-USD.yaml b/signals/CS/TWT-USD.yaml
index e96ae5a..3f1f37f 100644
--- a/signals/CS/TWT-USD.yaml
+++ b/signals/CS/TWT-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: TWTUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: trust-wallet-token
diff --git a/signals/CS/UMA-USD.yaml b/signals/CS/UMA-USD.yaml
index 9f62da1..a1dd3e2 100644
--- a/signals/CS/UMA-USD.yaml
+++ b/signals/CS/UMA-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: UMAUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: UMA-USD
diff --git a/signals/CS/UNI-USD.yaml b/signals/CS/UNI-USD.yaml
index a474c0c..a4873e5 100644
--- a/signals/CS/UNI-USD.yaml
+++ b/signals/CS/UNI-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: UNIUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: UNIUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: UNI-USD
diff --git a/signals/CS/W-USD.yaml b/signals/CS/W-USD.yaml
index 0ca7b2c..0d202bb 100644
--- a/signals/CS/W-USD.yaml
+++ b/signals/CS/W-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: WUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: wormhole
diff --git a/signals/CS/WEMIX-USD.yaml b/signals/CS/WEMIX-USD.yaml
index 8c3c57a..ba77b45 100644
--- a/signals/CS/WEMIX-USD.yaml
+++ b/signals/CS/WEMIX-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: WEMIXUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: wemix-token
diff --git a/signals/CS/WIF-USD.yaml b/signals/CS/WIF-USD.yaml
index 0a07f08..562f322 100644
--- a/signals/CS/WIF-USD.yaml
+++ b/signals/CS/WIF-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: WIFUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: WIFUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: dogwifcoin
diff --git a/signals/CS/WLD-USD.yaml b/signals/CS/WLD-USD.yaml
index 75d6696..3a68abe 100644
--- a/signals/CS/WLD-USD.yaml
+++ b/signals/CS/WLD-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: WLDUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: WLDUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: worldcoin-wld
diff --git a/signals/CS/WOO-USD.yaml b/signals/CS/WOO-USD.yaml
index 8491e1d..4e0da86 100644
--- a/signals/CS/WOO-USD.yaml
+++ b/signals/CS/WOO-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: WOOUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: woo-network
diff --git a/signals/CS/XDC-USD.yaml b/signals/CS/XDC-USD.yaml
index ab6c278..8fa391b 100644
--- a/signals/CS/XDC-USD.yaml
+++ b/signals/CS/XDC-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: XDCUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: xdce-crowd-sale
diff --git a/signals/CS/XEC-USD.yaml b/signals/CS/XEC-USD.yaml
index 7799943..1c6c11d 100644
--- a/signals/CS/XEC-USD.yaml
+++ b/signals/CS/XEC-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: XECUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: ecash
diff --git a/signals/CS/XLM-USD.yaml b/signals/CS/XLM-USD.yaml
index 955461b..4d210d6 100644
--- a/signals/CS/XLM-USD.yaml
+++ b/signals/CS/XLM-USD.yaml
@@ -7,12 +7,12 @@ sources:
 - source_id: bybit
   id: XLMUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: XLMUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: XLM-USD
diff --git a/signals/CS/XMR-USD.yaml b/signals/CS/XMR-USD.yaml
index 1d7f6d2..3326759 100644
--- a/signals/CS/XMR-USD.yaml
+++ b/signals/CS/XMR-USD.yaml
@@ -10,5 +10,5 @@ sources:
 - source_id: kraken
   id: XMR/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
diff --git a/signals/CS/XRP-USD.yaml b/signals/CS/XRP-USD.yaml
index 4e145a0..0948211 100644
--- a/signals/CS/XRP-USD.yaml
+++ b/signals/CS/XRP-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: XRPUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: XRPUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: XRP-USD
@@ -37,7 +37,7 @@ sources:
 - source_id: kraken
   id: XRP/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: XRP-USDC
diff --git a/signals/CS/XTZ-USD.yaml b/signals/CS/XTZ-USD.yaml
index 4af98ed..4901c16 100644
--- a/signals/CS/XTZ-USD.yaml
+++ b/signals/CS/XTZ-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: XTZUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: XTZ-USD
@@ -22,7 +22,7 @@ sources:
 - source_id: kraken
   id: XTZ/USDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: okx
   id: XTZ-USDC
diff --git a/signals/CS/ZETA-USD.yaml b/signals/CS/ZETA-USD.yaml
index 2342927..ac50512 100644
--- a/signals/CS/ZETA-USD.yaml
+++ b/signals/CS/ZETA-USD.yaml
@@ -2,7 +2,7 @@ sources:
 - source_id: bybit
   id: ZETAUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: ZETA-USD
diff --git a/signals/CS/ZIL-USD.yaml b/signals/CS/ZIL-USD.yaml
index 99b2376..b48259e 100644
--- a/signals/CS/ZIL-USD.yaml
+++ b/signals/CS/ZIL-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: ZILUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coingecko
   id: zilliqa
diff --git a/signals/CS/ZK-USD.yaml b/signals/CS/ZK-USD.yaml
index a592f9d..59746d8 100644
--- a/signals/CS/ZK-USD.yaml
+++ b/signals/CS/ZK-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: ZKUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: ZKUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: ZK-USD
diff --git a/signals/CS/ZRO-USD.yaml b/signals/CS/ZRO-USD.yaml
index 035ea96..647b84e 100644
--- a/signals/CS/ZRO-USD.yaml
+++ b/signals/CS/ZRO-USD.yaml
@@ -12,12 +12,12 @@ sources:
 - source_id: bybit
   id: ZROUSDC
   routes:
-  - signal_id: USDC-USD
+  - signal_id: CS:USDC-USD
     operation: '*'
 - source_id: bybit
   id: ZROUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: ZRO-USD
diff --git a/signals/CS/ZRX-USD.yaml b/signals/CS/ZRX-USD.yaml
index 9bbf4af..db945fe 100644
--- a/signals/CS/ZRX-USD.yaml
+++ b/signals/CS/ZRX-USD.yaml
@@ -7,7 +7,7 @@ sources:
 - source_id: bybit
   id: ZRXUSDT
   routes:
-  - signal_id: USDT-USD
+  - signal_id: CS:USDT-USD
     operation: '*'
 - source_id: coinbase
   id: ZRX-USD