diff --git a/Parsers/AMarkets/AUDUSD/x-saherelm.xch.market.symbol.long.parser.mq5 b/Parsers/AMarkets/AUDUSD/x-saherelm.xch.amarkets.audusd.long.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/AUDUSD/x-saherelm.xch.market.symbol.long.parser.mq5
rename to Parsers/AMarkets/AUDUSD/x-saherelm.xch.amarkets.audusd.long.parser.mq5
diff --git a/Parsers/AMarkets/AUDUSD/x-saherelm.xch.market.symbol.short.parser.mq5 b/Parsers/AMarkets/AUDUSD/x-saherelm.xch.amarkets.audusd.short.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/AUDUSD/x-saherelm.xch.market.symbol.short.parser.mq5
rename to Parsers/AMarkets/AUDUSD/x-saherelm.xch.amarkets.audusd.short.parser.mq5
diff --git a/Parsers/AMarkets/DowJones/x-saherelm.xch.market.symbol.long.parser.mq5 b/Parsers/AMarkets/DowJones/x-saherelm.xch.amarkets.us30.long.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/DowJones/x-saherelm.xch.market.symbol.long.parser.mq5
rename to Parsers/AMarkets/DowJones/x-saherelm.xch.amarkets.us30.long.parser.mq5
diff --git a/Parsers/AMarkets/DowJones/x-saherelm.xch.market.symbol.short.parser.mq5 b/Parsers/AMarkets/DowJones/x-saherelm.xch.amarkets.us30.short.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/DowJones/x-saherelm.xch.market.symbol.short.parser.mq5
rename to Parsers/AMarkets/DowJones/x-saherelm.xch.amarkets.us30.short.parser.mq5
diff --git a/Parsers/AMarkets/EURCAD/x-saherelm.xch.market.symbol.long.parser.mq5 b/Parsers/AMarkets/EURCAD/x-saherelm.xch.amarkets.eurcad.long.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/EURCAD/x-saherelm.xch.market.symbol.long.parser.mq5
rename to Parsers/AMarkets/EURCAD/x-saherelm.xch.amarkets.eurcad.long.parser.mq5
diff --git a/Parsers/AMarkets/EURCAD/x-saherelm.xch.market.symbol.short.parser.mq5 b/Parsers/AMarkets/EURCAD/x-saherelm.xch.amarkets.eurcad.short.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/EURCAD/x-saherelm.xch.market.symbol.short.parser.mq5
rename to Parsers/AMarkets/EURCAD/x-saherelm.xch.amarkets.eurcad.short.parser.mq5
diff --git a/Parsers/AMarkets/EURCHF/x-saherelm.xch.market.symbol.long.parser.mq5 b/Parsers/AMarkets/EURCHF/x-saherelm.xch.amarkets.eurchf.long.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/EURCHF/x-saherelm.xch.market.symbol.long.parser.mq5
rename to Parsers/AMarkets/EURCHF/x-saherelm.xch.amarkets.eurchf.long.parser.mq5
diff --git a/Parsers/AMarkets/EURCHF/x-saherelm.xch.market.symbol.short.parser.mq5 b/Parsers/AMarkets/EURCHF/x-saherelm.xch.amarkets.eurchf.short.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/EURCHF/x-saherelm.xch.market.symbol.short.parser.mq5
rename to Parsers/AMarkets/EURCHF/x-saherelm.xch.amarkets.eurchf.short.parser.mq5
diff --git a/Parsers/AMarkets/EURGBP/x-saherelm.xch.market.symbol.long.parser.mq5 b/Parsers/AMarkets/EURGBP/x-saherelm.xch.amarkets.eurgbp.long.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/EURGBP/x-saherelm.xch.market.symbol.long.parser.mq5
rename to Parsers/AMarkets/EURGBP/x-saherelm.xch.amarkets.eurgbp.long.parser.mq5
diff --git a/Parsers/AMarkets/EURGBP/x-saherelm.xch.market.symbol.short.parser.mq5 b/Parsers/AMarkets/EURGBP/x-saherelm.xch.amarkets.eurgbp.short.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/EURGBP/x-saherelm.xch.market.symbol.short.parser.mq5
rename to Parsers/AMarkets/EURGBP/x-saherelm.xch.amarkets.eurgbp.short.parser.mq5
diff --git a/Parsers/AMarkets/EURJPY/x-saherelm.xch.market.symbol.long.parser.mq5 b/Parsers/AMarkets/EURJPY/x-saherelm.xch.amarkets.eurjpy.long.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/EURJPY/x-saherelm.xch.market.symbol.long.parser.mq5
rename to Parsers/AMarkets/EURJPY/x-saherelm.xch.amarkets.eurjpy.long.parser.mq5
diff --git a/Parsers/AMarkets/EURJPY/x-saherelm.xch.market.symbol.short.parser.mq5 b/Parsers/AMarkets/EURJPY/x-saherelm.xch.amarkets.eurjpy.short.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/EURJPY/x-saherelm.xch.market.symbol.short.parser.mq5
rename to Parsers/AMarkets/EURJPY/x-saherelm.xch.amarkets.eurjpy.short.parser.mq5
diff --git a/Parsers/AMarkets/EURUSD/x-saherelm.xch.market.symbol.long.parser.mq5 b/Parsers/AMarkets/EURUSD/x-saherelm.xch.amarkets.eurusd.long.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/EURUSD/x-saherelm.xch.market.symbol.long.parser.mq5
rename to Parsers/AMarkets/EURUSD/x-saherelm.xch.amarkets.eurusd.long.parser.mq5
diff --git a/Parsers/AMarkets/EURUSD/x-saherelm.xch.market.symbol.short.parser.mq5 b/Parsers/AMarkets/EURUSD/x-saherelm.xch.amarkets.eurusd.short.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/EURUSD/x-saherelm.xch.market.symbol.short.parser.mq5
rename to Parsers/AMarkets/EURUSD/x-saherelm.xch.amarkets.eurusd.short.parser.mq5
diff --git a/Parsers/AMarkets/GBPUSD/x-saherelm.xch.market.symbol.long.parser.mq5 b/Parsers/AMarkets/GBPUSD/x-saherelm.xch.amarkets.gbpusd.long.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/GBPUSD/x-saherelm.xch.market.symbol.long.parser.mq5
rename to Parsers/AMarkets/GBPUSD/x-saherelm.xch.amarkets.gbpusd.long.parser.mq5
diff --git a/Parsers/AMarkets/GBPUSD/x-saherelm.xch.market.symbol.short.parser.mq5 b/Parsers/AMarkets/GBPUSD/x-saherelm.xch.amarkets.gbpusd.short.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/GBPUSD/x-saherelm.xch.market.symbol.short.parser.mq5
rename to Parsers/AMarkets/GBPUSD/x-saherelm.xch.amarkets.gbpusd.short.parser.mq5
diff --git a/Parsers/AMarkets/NZDUSD/x-saherelm.xch.market.symbol.long.parser.mq5 b/Parsers/AMarkets/NZDUSD/x-saherelm.xch.amarkets.nzdusd.long.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/NZDUSD/x-saherelm.xch.market.symbol.long.parser.mq5
rename to Parsers/AMarkets/NZDUSD/x-saherelm.xch.amarkets.nzdusd.long.parser.mq5
diff --git a/Parsers/AMarkets/NZDUSD/x-saherelm.xch.market.symbol.short.parser.mq5 b/Parsers/AMarkets/NZDUSD/x-saherelm.xch.amarkets.nzdusd.short.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/NZDUSD/x-saherelm.xch.market.symbol.short.parser.mq5
rename to Parsers/AMarkets/NZDUSD/x-saherelm.xch.amarkets.nzdusd.short.parser.mq5
diff --git a/Parsers/AMarkets/USDCAD/x-saherelm.xch.market.symbol.long.parser.mq5 b/Parsers/AMarkets/USDCAD/x-saherelm.xch.amarkets.usdcad.long.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/USDCAD/x-saherelm.xch.market.symbol.long.parser.mq5
rename to Parsers/AMarkets/USDCAD/x-saherelm.xch.amarkets.usdcad.long.parser.mq5
diff --git a/Parsers/AMarkets/USDCAD/x-saherelm.xch.market.symbol.short.parser.mq5 b/Parsers/AMarkets/USDCAD/x-saherelm.xch.amarkets.usdcad.short.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/USDCAD/x-saherelm.xch.market.symbol.short.parser.mq5
rename to Parsers/AMarkets/USDCAD/x-saherelm.xch.amarkets.usdcad.short.parser.mq5
diff --git a/Parsers/AMarkets/USDCHF/x-saherelm.xch.market.symbol.long.parser.mq5 b/Parsers/AMarkets/USDCHF/x-saherelm.xch.amarkets.usdchf.long.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/USDCHF/x-saherelm.xch.market.symbol.long.parser.mq5
rename to Parsers/AMarkets/USDCHF/x-saherelm.xch.amarkets.usdchf.long.parser.mq5
diff --git a/Parsers/AMarkets/USDCHF/x-saherelm.xch.market.symbol.short.parser.mq5 b/Parsers/AMarkets/USDCHF/x-saherelm.xch.amarkets.usdchf.short.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/USDCHF/x-saherelm.xch.market.symbol.short.parser.mq5
rename to Parsers/AMarkets/USDCHF/x-saherelm.xch.amarkets.usdchf.short.parser.mq5
diff --git a/Parsers/AMarkets/USDJPY/x-saherelm.xch.market.symbol.long.parser.mq5 b/Parsers/AMarkets/USDJPY/x-saherelm.xch.amarkets.usdjpy.long.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/USDJPY/x-saherelm.xch.market.symbol.long.parser.mq5
rename to Parsers/AMarkets/USDJPY/x-saherelm.xch.amarkets.usdjpy.long.parser.mq5
diff --git a/Parsers/AMarkets/USDJPY/x-saherelm.xch.market.symbol.short.parser.mq5 b/Parsers/AMarkets/USDJPY/x-saherelm.xch.amarkets.usdjpy.short.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/USDJPY/x-saherelm.xch.market.symbol.short.parser.mq5
rename to Parsers/AMarkets/USDJPY/x-saherelm.xch.amarkets.usdjpy.short.parser.mq5
diff --git a/Parsers/AMarkets/XAUUSD/x-saherelm.xch.market.symbol.long.parser.mq5 b/Parsers/AMarkets/XAUUSD/x-saherelm.xch.amarkets.xauusd.long.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/XAUUSD/x-saherelm.xch.market.symbol.long.parser.mq5
rename to Parsers/AMarkets/XAUUSD/x-saherelm.xch.amarkets.xauusd.long.parser.mq5
diff --git a/Parsers/AMarkets/XAUUSD/x-saherelm.xch.market.symbol.short.parser.mq5 b/Parsers/AMarkets/XAUUSD/x-saherelm.xch.amarkets.xauusd.short.parser.mq5
similarity index 100%
rename from Parsers/AMarkets/XAUUSD/x-saherelm.xch.market.symbol.short.parser.mq5
rename to Parsers/AMarkets/XAUUSD/x-saherelm.xch.amarkets.xauusd.short.parser.mq5