diff --git a/cmd/exchange_template/wrapper_file.tmpl b/cmd/exchange_template/wrapper_file.tmpl
index 0346f6a3..fd86723b 100644
--- a/cmd/exchange_template/wrapper_file.tmpl
+++ b/cmd/exchange_template/wrapper_file.tmpl
@@ -24,9 +24,9 @@ func ({{.Variable}} *{{.CapitalName}}) Start(wg *sync.WaitGroup) {
 // Run implements the {{.CapitalName}} wrapper
 func ({{.Variable}} *{{.CapitalName}}) Run() {
 	if {{.Variable}}.Verbose {
-{{if .WS}} log.Debugf(log.ExchangeSys, "%s Websocket: %s. (url: %s).\n", {{.Variable}}.GetName(), common.IsEnabled({{.Variable}}.Websocket.IsEnabled()), {{.Variable}}.Websocket.GetWebsocketURL()) {{end}}
-		log.Debugf(log.ExchangeSys, "%s polling delay: %ds.\n", {{.Variable}}.GetName(), {{.Variable}}.RESTPollingDelay)
-		log.Debugf(log.ExchangeSys, "%s %d currencies enabled: %s.\n", {{.Variable}}.GetName(), len({{.Variable}}.EnabledPairs), {{.Variable}}.EnabledPairs)
+{{if .WS}} log.Debugf(log.ExchangeSys, "%s Websocket: %s. (url: %s).\n", {{.Variable}}.Name, common.IsEnabled({{.Variable}}.Websocket.IsEnabled()), {{.Variable}}.Websocket.GetWebsocketURL()) {{end}}
+		log.Debugf(log.ExchangeSys, "%s polling delay: %ds.\n", {{.Variable}}.Name, {{.Variable}}.RESTPollingDelay)
+		log.Debugf(log.ExchangeSys, "%s %d currencies enabled: %s.\n", {{.Variable}}.Name, len({{.Variable}}.EnabledPairs), {{.Variable}}.EnabledPairs)
 	}
 }
 
@@ -60,7 +60,7 @@ func ({{.Variable}} *{{.CapitalName}}) UpdateTicker(p currency.Pair, assetType a
 
 // FetchTicker returns the ticker for a currency pair
 func ({{.Variable}} *{{.CapitalName}}) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker({{.Variable}}.GetName(), p, assetType)
+	tickerNew, err := ticker.GetTicker({{.Variable}}.Name, p, assetType)
 	if err != nil {
 		return {{.Variable}}.UpdateTicker(p, assetType)
 	}
@@ -69,7 +69,7 @@ func ({{.Variable}} *{{.CapitalName}}) FetchTicker(p currency.Pair, assetType as
 
 // FetchOrderbook returns orderbook base on the currency pair
 func ({{.Variable}} *{{.CapitalName}}) FetchOrderbook(currency currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get({{.Variable}}.GetName(), currency, assetType)
+	ob, err := orderbook.Get({{.Variable}}.Name, currency, assetType)
 	if err != nil {
 		return {{.Variable}}.UpdateOrderbook(currency, assetType)
 	}
@@ -93,7 +93,7 @@ func ({{.Variable}} *{{.CapitalName}}) UpdateOrderbook(p currency.Pair, assetTyp
 	//	orderBook.Asks = append(orderBook.Asks, orderbook.Item{Amount: asks.Quantity, Price: asks.Price})
 	//}
 
-	//orderbook.ProcessOrderbook(b.GetName(), p, orderBook, assetType)
+	//orderbook.ProcessOrderbook(b.Name, p, orderBook, assetType)
 	//return orderbook.Get({{.Variable}}.Name, p, assetType)
   return orderBook, nil // NOTE DO NOT USE AS RETURN
 }
diff --git a/exchanges/alphapoint/alphapoint_wrapper.go b/exchanges/alphapoint/alphapoint_wrapper.go
index db352257..a28e4368 100644
--- a/exchanges/alphapoint/alphapoint_wrapper.go
+++ b/exchanges/alphapoint/alphapoint_wrapper.go
@@ -88,7 +88,7 @@ func (a *Alphapoint) UpdateTradablePairs(forceUpdate bool) error {
 // Alphapoint exchange
 func (a *Alphapoint) GetAccountInfo() (exchange.AccountInfo, error) {
 	var response exchange.AccountInfo
-	response.Exchange = a.GetName()
+	response.Exchange = a.Name
 	account, err := a.GetAccountInformation()
 	if err != nil {
 		return response, err
@@ -127,7 +127,7 @@ func (a *Alphapoint) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker
 	tickerPrice.Volume = tick.Volume
 	tickerPrice.Last = tick.Last
 
-	err = ticker.ProcessTicker(a.GetName(), &tickerPrice, assetType)
+	err = ticker.ProcessTicker(a.Name, &tickerPrice, assetType)
 	if err != nil {
 		return tickerPrice, err
 	}
@@ -137,7 +137,7 @@ func (a *Alphapoint) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker
 
 // FetchTicker returns the ticker for a currency pair
 func (a *Alphapoint) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tick, err := ticker.GetTicker(a.GetName(), p, assetType)
+	tick, err := ticker.GetTicker(a.Name, p, assetType)
 	if err != nil {
 		return a.UpdateTicker(p, assetType)
 	}
@@ -165,7 +165,7 @@ func (a *Alphapoint) UpdateOrderbook(p currency.Pair, assetType asset.Item) (ord
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = a.GetName()
+	orderBook.ExchangeName = a.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
@@ -178,7 +178,7 @@ func (a *Alphapoint) UpdateOrderbook(p currency.Pair, assetType asset.Item) (ord
 
 // FetchOrderbook returns the orderbook for a currency pair
 func (a *Alphapoint) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(a.GetName(), p, assetType)
+	ob, err := orderbook.Get(a.Name, p, assetType)
 	if err != nil {
 		return a.UpdateOrderbook(p, assetType)
 	}
diff --git a/exchanges/anx/anx_live_test.go b/exchanges/anx/anx_live_test.go
index f1d0d3cf..2618cad8 100644
--- a/exchanges/anx/anx_live_test.go
+++ b/exchanges/anx/anx_live_test.go
@@ -33,6 +33,6 @@ func TestMain(m *testing.M) {
 	if err != nil {
 		log.Fatal("ANX setup error", err)
 	}
-	log.Printf(sharedtestvalues.LiveTesting, a.GetName(), a.API.Endpoints.URL)
+	log.Printf(sharedtestvalues.LiveTesting, a.Name, a.API.Endpoints.URL)
 	os.Exit(m.Run())
 }
diff --git a/exchanges/anx/anx_mock_test.go b/exchanges/anx/anx_mock_test.go
index f4b426b8..8871ced0 100644
--- a/exchanges/anx/anx_mock_test.go
+++ b/exchanges/anx/anx_mock_test.go
@@ -46,6 +46,6 @@ func TestMain(m *testing.M) {
 	a.HTTPClient = newClient
 	a.API.Endpoints.URL = serverDetails + "/"
 
-	log.Printf(sharedtestvalues.MockTesting, a.GetName(), a.API.Endpoints.URL)
+	log.Printf(sharedtestvalues.MockTesting, a.Name, a.API.Endpoints.URL)
 	os.Exit(m.Run())
 }
diff --git a/exchanges/anx/anx_wrapper.go b/exchanges/anx/anx_wrapper.go
index d15c0dea..6b4b7e57 100644
--- a/exchanges/anx/anx_wrapper.go
+++ b/exchanges/anx/anx_wrapper.go
@@ -155,7 +155,7 @@ func (a *ANX) Run() {
 		forceUpdate = true
 		err := a.UpdatePairs(enabledPairs, asset.Spot, true, true)
 		if err != nil {
-			log.Errorf(log.ExchangeSys, "%s failed to update currencies.\n", a.GetName())
+			log.Errorf(log.ExchangeSys, "%s failed to update currencies.\n", a.Name)
 			return
 		}
 	}
@@ -166,7 +166,7 @@ func (a *ANX) Run() {
 
 	err := a.UpdateTradablePairs(forceUpdate)
 	if err != nil {
-		log.Errorf(log.ExchangeSys, "%s failed to update tradable pairs. Err: %s", a.GetName(), err)
+		log.Errorf(log.ExchangeSys, "%s failed to update tradable pairs. Err: %s", a.Name, err)
 	}
 }
 
@@ -221,7 +221,7 @@ func (a *ANX) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Price,
 		LastUpdated: time.Unix(0, tick.Data.UpdateTime),
 	}
 
-	err = ticker.ProcessTicker(a.GetName(), &tickerPrice, assetType)
+	err = ticker.ProcessTicker(a.Name, &tickerPrice, assetType)
 	if err != nil {
 		return tickerPrice, err
 	}
@@ -231,7 +231,7 @@ func (a *ANX) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Price,
 
 // FetchTicker returns the ticker for a currency pair
 func (a *ANX) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker(a.GetName(), p, assetType)
+	tickerNew, err := ticker.GetTicker(a.Name, p, assetType)
 	if err != nil {
 		return a.UpdateTicker(p, assetType)
 	}
@@ -240,7 +240,7 @@ func (a *ANX) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price,
 
 // FetchOrderbook returns the orderbook for a currency pair
 func (a *ANX) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(a.GetName(), p, assetType)
+	ob, err := orderbook.Get(a.Name, p, assetType)
 	if err != nil {
 		return a.UpdateOrderbook(p, assetType)
 	}
@@ -270,7 +270,7 @@ func (a *ANX) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderbook.
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = a.GetName()
+	orderBook.ExchangeName = a.Name
 	orderBook.AssetType = assetType
 	err = orderBook.Process()
 	if err != nil {
@@ -299,7 +299,7 @@ func (a *ANX) GetAccountInfo() (exchange.AccountInfo, error) {
 		})
 	}
 
-	info.Exchange = a.GetName()
+	info.Exchange = a.Name
 	info.Accounts = append(info.Accounts, exchange.Account{
 		Currencies: balance,
 	})
diff --git a/exchanges/binance/binance_live_test.go b/exchanges/binance/binance_live_test.go
index f0dce783..d9745102 100644
--- a/exchanges/binance/binance_live_test.go
+++ b/exchanges/binance/binance_live_test.go
@@ -33,6 +33,6 @@ func TestMain(m *testing.M) {
 	if err != nil {
 		log.Fatal("Binance setup error", err)
 	}
-	log.Printf(sharedtestvalues.LiveTesting, b.GetName(), b.API.Endpoints.URL)
+	log.Printf(sharedtestvalues.LiveTesting, b.Name, b.API.Endpoints.URL)
 	os.Exit(m.Run())
 }
diff --git a/exchanges/binance/binance_mock_test.go b/exchanges/binance/binance_mock_test.go
index dccf08fd..28160f03 100644
--- a/exchanges/binance/binance_mock_test.go
+++ b/exchanges/binance/binance_mock_test.go
@@ -46,6 +46,6 @@ func TestMain(m *testing.M) {
 	b.HTTPClient = newClient
 	b.API.Endpoints.URL = serverDetails
 
-	log.Printf(sharedtestvalues.MockTesting, b.GetName(), b.API.Endpoints.URL)
+	log.Printf(sharedtestvalues.MockTesting, b.Name, b.API.Endpoints.URL)
 	os.Exit(m.Run())
 }
diff --git a/exchanges/binance/binance_websocket.go b/exchanges/binance/binance_websocket.go
index 9b2ab70b..f555d48d 100644
--- a/exchanges/binance/binance_websocket.go
+++ b/exchanges/binance/binance_websocket.go
@@ -133,7 +133,7 @@ func (b *Binance) WsHandleData() {
 					Timestamp: time.Unix(0, trade.TimeStamp),
 					Price:     price,
 					Amount:    amount,
-					Exchange:  b.GetName(),
+					Exchange:  b.Name,
 					AssetType: asset.Spot,
 					Side:      trade.EventType,
 				}
@@ -181,7 +181,7 @@ func (b *Binance) WsHandleData() {
 				wsKline.Pair = currency.NewPairFromFormattedPairs(kline.Symbol, b.GetEnabledPairs(asset.Spot),
 					b.GetPairFormat(asset.Spot, true))
 				wsKline.AssetType = asset.Spot
-				wsKline.Exchange = b.GetName()
+				wsKline.Exchange = b.Name
 				wsKline.StartTime = time.Unix(0, kline.Kline.StartTime)
 				wsKline.CloseTime = time.Unix(0, kline.Kline.CloseTime)
 				wsKline.Interval = kline.Kline.Interval
@@ -215,7 +215,7 @@ func (b *Binance) WsHandleData() {
 				b.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
 					Pair:     currencyPair,
 					Asset:    asset.Spot,
-					Exchange: b.GetName(),
+					Exchange: b.Name,
 				}
 				continue
 			}
@@ -251,7 +251,7 @@ func (b *Binance) SeedLocalCache(p currency.Pair) error {
 	newOrderBook.LastUpdated = time.Unix(orderbookNew.LastUpdateID, 0)
 	newOrderBook.Pair = p
 	newOrderBook.AssetType = asset.Spot
-	newOrderBook.ExchangeName = b.GetName()
+	newOrderBook.ExchangeName = b.Name
 
 	return b.Websocket.Orderbook.LoadSnapshot(&newOrderBook)
 }
diff --git a/exchanges/binance/binance_wrapper.go b/exchanges/binance/binance_wrapper.go
index 65c1d515..829915fc 100644
--- a/exchanges/binance/binance_wrapper.go
+++ b/exchanges/binance/binance_wrapper.go
@@ -184,7 +184,7 @@ func (b *Binance) Run() {
 	if b.Verbose {
 		log.Debugf(log.ExchangeSys,
 			"%s Websocket: %s. (url: %s).\n",
-			b.GetName(),
+			b.Name,
 			common.IsEnabled(b.Websocket.IsEnabled()),
 			b.Websocket.GetWebsocketURL())
 		b.PrintEnabledPairs()
@@ -291,7 +291,7 @@ func (b *Binance) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Pr
 
 // FetchTicker returns the ticker for a currency pair
 func (b *Binance) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker(b.GetName(), p, assetType)
+	tickerNew, err := ticker.GetTicker(b.Name, p, assetType)
 	if err != nil {
 		return b.UpdateTicker(p, assetType)
 	}
@@ -300,7 +300,7 @@ func (b *Binance) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Pri
 
 // FetchOrderbook returns orderbook base on the currency pair
 func (b *Binance) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(b.GetName(), p, assetType)
+	ob, err := orderbook.Get(b.Name, p, assetType)
 	if err != nil {
 		return b.UpdateOrderbook(p, assetType)
 	}
@@ -333,7 +333,7 @@ func (b *Binance) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderb
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = b.GetName()
+	orderBook.ExchangeName = b.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
@@ -372,7 +372,7 @@ func (b *Binance) GetAccountInfo() (exchange.AccountInfo, error) {
 		})
 	}
 
-	info.Exchange = b.GetName()
+	info.Exchange = b.Name
 	info.Accounts = append(info.Accounts, exchange.Account{
 		Currencies: currencyBalance,
 	})
diff --git a/exchanges/bitfinex/bitfinex_websocket.go b/exchanges/bitfinex/bitfinex_websocket.go
index 478ea6ad..3be37672 100644
--- a/exchanges/bitfinex/bitfinex_websocket.go
+++ b/exchanges/bitfinex/bitfinex_websocket.go
@@ -106,7 +106,7 @@ func (b *Bitfinex) WsAddSubscriptionChannel(chanID int, channel, pair string) {
 
 	if b.Verbose {
 		log.Debugf(log.ExchangeSys, "%s Subscribed to Channel: %s Pair: %s ChannelID: %d\n",
-			b.GetName(),
+			b.Name,
 			channel,
 			pair,
 			chanID)
@@ -151,7 +151,7 @@ func (b *Bitfinex) WsConnect() error {
 	b.GenerateDefaultSubscriptions()
 	if hs.Event == "info" {
 		if b.Verbose {
-			log.Debugf(log.ExchangeSys, "%s Connected to Websocket.\n", b.GetName())
+			log.Debugf(log.ExchangeSys, "%s Connected to Websocket.\n", b.Name)
 		}
 	}
 
@@ -445,7 +445,7 @@ func (b *Bitfinex) WsDataHandler() {
 								Timestamp:    time.Unix(trades[0].Timestamp, 0),
 								Price:        trades[0].Price,
 								Amount:       newAmount,
-								Exchange:     b.GetName(),
+								Exchange:     b.Name,
 								AssetType:    asset.Spot,
 								Side:         side,
 							}
@@ -479,7 +479,7 @@ func (b *Bitfinex) WsInsertSnapshot(p currency.Pair, assetType asset.Item, books
 	newOrderBook.AssetType = assetType
 	newOrderBook.Bids = bid
 	newOrderBook.Pair = p
-	newOrderBook.ExchangeName = b.GetName()
+	newOrderBook.ExchangeName = b.Name
 
 	err := b.Websocket.Orderbook.LoadSnapshot(&newOrderBook)
 	if err != nil {
@@ -487,7 +487,7 @@ func (b *Bitfinex) WsInsertSnapshot(p currency.Pair, assetType asset.Item, books
 	}
 	b.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{Pair: p,
 		Asset:    assetType,
-		Exchange: b.GetName()}
+		Exchange: b.Name}
 	return nil
 }
 
@@ -529,7 +529,7 @@ func (b *Bitfinex) WsUpdateOrderbook(p currency.Pair, assetType asset.Item, book
 
 	b.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{Pair: p,
 		Asset:    assetType,
-		Exchange: b.GetName()}
+		Exchange: b.Name}
 
 	return nil
 }
diff --git a/exchanges/bitfinex/bitfinex_wrapper.go b/exchanges/bitfinex/bitfinex_wrapper.go
index 5b247971..c5aa9cc2 100644
--- a/exchanges/bitfinex/bitfinex_wrapper.go
+++ b/exchanges/bitfinex/bitfinex_wrapper.go
@@ -191,7 +191,7 @@ func (b *Bitfinex) Run() {
 	if b.Verbose {
 		log.Debugf(log.ExchangeSys,
 			"%s Websocket: %s.",
-			b.GetName(),
+			b.Name,
 			common.IsEnabled(b.Websocket.IsEnabled()))
 		b.PrintEnabledPairs()
 	}
@@ -260,7 +260,7 @@ func (b *Bitfinex) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.P
 // FetchTicker returns the ticker for a currency pair
 func (b *Bitfinex) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
 	b.appendOptionalDelimiter(&p)
-	tick, err := ticker.GetTicker(b.GetName(), p, asset.Spot)
+	tick, err := ticker.GetTicker(b.Name, p, asset.Spot)
 	if err != nil {
 		return b.UpdateTicker(p, assetType)
 	}
@@ -270,7 +270,7 @@ func (b *Bitfinex) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Pr
 // FetchOrderbook returns the orderbook for a currency pair
 func (b *Bitfinex) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
 	b.appendOptionalDelimiter(&p)
-	ob, err := orderbook.Get(b.GetName(), p, assetType)
+	ob, err := orderbook.Get(b.Name, p, assetType)
 	if err != nil {
 		return b.UpdateOrderbook(p, assetType)
 	}
@@ -302,7 +302,7 @@ func (b *Bitfinex) UpdateOrderbook(p currency.Pair, assetType asset.Item) (order
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = b.GetName()
+	orderBook.ExchangeName = b.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
@@ -317,7 +317,7 @@ func (b *Bitfinex) UpdateOrderbook(p currency.Pair, assetType asset.Item) (order
 // Bitfinex exchange
 func (b *Bitfinex) GetAccountInfo() (exchange.AccountInfo, error) {
 	var response exchange.AccountInfo
-	response.Exchange = b.GetName()
+	response.Exchange = b.Name
 	accountBalance, err := b.GetAccountBalance()
 	if err != nil {
 		return response, err
diff --git a/exchanges/bitflyer/bitflyer_wrapper.go b/exchanges/bitflyer/bitflyer_wrapper.go
index 992226dd..7bbce079 100644
--- a/exchanges/bitflyer/bitflyer_wrapper.go
+++ b/exchanges/bitflyer/bitflyer_wrapper.go
@@ -190,7 +190,7 @@ func (b *Bitflyer) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.P
 	tickerPrice.Bid = tickerNew.BestBid
 	tickerPrice.Last = tickerNew.Last
 	tickerPrice.Volume = tickerNew.Volume
-	err = ticker.ProcessTicker(b.GetName(), &tickerPrice, assetType)
+	err = ticker.ProcessTicker(b.Name, &tickerPrice, assetType)
 	if err != nil {
 		return tickerPrice, err
 	}
@@ -200,7 +200,7 @@ func (b *Bitflyer) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.P
 
 // FetchTicker returns the ticker for a currency pair
 func (b *Bitflyer) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tick, err := ticker.GetTicker(b.GetName(), p, assetType)
+	tick, err := ticker.GetTicker(b.Name, p, assetType)
 	if err != nil {
 		return b.UpdateTicker(p, assetType)
 	}
@@ -218,7 +218,7 @@ func (b *Bitflyer) CheckFXString(p currency.Pair) currency.Pair {
 
 // FetchOrderbook returns the orderbook for a currency pair
 func (b *Bitflyer) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(b.GetName(), p, assetType)
+	ob, err := orderbook.Get(b.Name, p, assetType)
 	if err != nil {
 		return b.UpdateOrderbook(p, assetType)
 	}
@@ -245,7 +245,7 @@ func (b *Bitflyer) UpdateOrderbook(p currency.Pair, assetType asset.Item) (order
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = b.GetName()
+	orderBook.ExchangeName = b.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
diff --git a/exchanges/bithumb/bithumb_wrapper.go b/exchanges/bithumb/bithumb_wrapper.go
index d8f3041d..2e9b12c1 100644
--- a/exchanges/bithumb/bithumb_wrapper.go
+++ b/exchanges/bithumb/bithumb_wrapper.go
@@ -202,7 +202,7 @@ func (b *Bithumb) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Pr
 
 // FetchTicker returns the ticker for a currency pair
 func (b *Bithumb) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker(b.GetName(), p, assetType)
+	tickerNew, err := ticker.GetTicker(b.Name, p, assetType)
 	if err != nil {
 		return b.UpdateTicker(p, assetType)
 	}
@@ -211,7 +211,7 @@ func (b *Bithumb) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Pri
 
 // FetchOrderbook returns orderbook base on the currency pair
 func (b *Bithumb) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(b.GetName(), p, assetType)
+	ob, err := orderbook.Get(b.Name, p, assetType)
 	if err != nil {
 		return b.UpdateOrderbook(p, assetType)
 	}
@@ -245,7 +245,7 @@ func (b *Bithumb) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderb
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = b.GetName()
+	orderBook.ExchangeName = b.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
@@ -284,7 +284,7 @@ func (b *Bithumb) GetAccountInfo() (exchange.AccountInfo, error) {
 		Currencies: exchangeBalances,
 	})
 
-	info.Exchange = b.GetName()
+	info.Exchange = b.Name
 	return info, nil
 }
 
diff --git a/exchanges/bitmex/bitmex_websocket.go b/exchanges/bitmex/bitmex_websocket.go
index 11718f72..5b33a6e1 100644
--- a/exchanges/bitmex/bitmex_websocket.go
+++ b/exchanges/bitmex/bitmex_websocket.go
@@ -246,7 +246,7 @@ func (b *Bitmex) wsHandleIncomingData() {
 							Price:        trades.Data[i].Price,
 							Amount:       float64(trades.Data[i].Size),
 							CurrencyPair: currency.NewPairFromString(trades.Data[i].Symbol),
-							Exchange:     b.GetName(),
+							Exchange:     b.Name,
 							AssetType:    "CONTRACT",
 							Side:         trades.Data[i].Side,
 						}
@@ -372,7 +372,7 @@ func (b *Bitmex) processOrderbook(data []OrderBookL2, action string, currencyPai
 		newOrderBook.Bids = bids
 		newOrderBook.AssetType = assetType
 		newOrderBook.Pair = currencyPair
-		newOrderBook.ExchangeName = b.GetName()
+		newOrderBook.ExchangeName = b.Name
 
 		err := b.Websocket.Orderbook.LoadSnapshot(&newOrderBook)
 		if err != nil {
@@ -382,7 +382,7 @@ func (b *Bitmex) processOrderbook(data []OrderBookL2, action string, currencyPai
 		b.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
 			Pair:     currencyPair,
 			Asset:    assetType,
-			Exchange: b.GetName(),
+			Exchange: b.Name,
 		}
 	default:
 		var asks, bids []orderbook.Item
@@ -414,7 +414,7 @@ func (b *Bitmex) processOrderbook(data []OrderBookL2, action string, currencyPai
 		b.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
 			Pair:     currencyPair,
 			Asset:    assetType,
-			Exchange: b.GetName(),
+			Exchange: b.Name,
 		}
 	}
 	return nil
diff --git a/exchanges/bitmex/bitmex_wrapper.go b/exchanges/bitmex/bitmex_wrapper.go
index 3f44db1a..306a8a9a 100644
--- a/exchanges/bitmex/bitmex_wrapper.go
+++ b/exchanges/bitmex/bitmex_wrapper.go
@@ -208,7 +208,7 @@ func (b *Bitmex) Start(wg *sync.WaitGroup) {
 // Run implements the Bitmex wrapper
 func (b *Bitmex) Run() {
 	if b.Verbose {
-		log.Debugf(log.ExchangeSys, "%s Websocket: %s. (url: %s).\n", b.GetName(), common.IsEnabled(b.Websocket.IsEnabled()), b.API.Endpoints.WebsocketURL)
+		log.Debugf(log.ExchangeSys, "%s Websocket: %s. (url: %s).\n", b.Name, common.IsEnabled(b.Websocket.IsEnabled()), b.API.Endpoints.WebsocketURL)
 		b.PrintEnabledPairs()
 	}
 
@@ -318,7 +318,7 @@ func (b *Bitmex) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Pri
 
 // FetchTicker returns the ticker for a currency pair
 func (b *Bitmex) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker(b.GetName(), p, assetType)
+	tickerNew, err := ticker.GetTicker(b.Name, p, assetType)
 	if err != nil {
 		return b.UpdateTicker(p, assetType)
 	}
@@ -327,7 +327,7 @@ func (b *Bitmex) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Pric
 
 // FetchOrderbook returns orderbook base on the currency pair
 func (b *Bitmex) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(b.GetName(), p, assetType)
+	ob, err := orderbook.Get(b.Name, p, assetType)
 	if err != nil {
 		return b.UpdateOrderbook(p, assetType)
 	}
@@ -359,7 +359,7 @@ func (b *Bitmex) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderbo
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = b.GetName()
+	orderBook.ExchangeName = b.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
@@ -389,7 +389,7 @@ func (b *Bitmex) GetAccountInfo() (exchange.AccountInfo, error) {
 		})
 	}
 
-	info.Exchange = b.GetName()
+	info.Exchange = b.Name
 	info.Accounts = append(info.Accounts, exchange.Account{
 		Currencies: balances,
 	})
diff --git a/exchanges/bitstamp/bitstamp_live_test.go b/exchanges/bitstamp/bitstamp_live_test.go
index 7fe346d1..66d0ef87 100644
--- a/exchanges/bitstamp/bitstamp_live_test.go
+++ b/exchanges/bitstamp/bitstamp_live_test.go
@@ -34,6 +34,6 @@ func TestMain(m *testing.M) {
 	if err != nil {
 		log.Fatal("Bitstamp setup error", err)
 	}
-	log.Printf(sharedtestvalues.LiveTesting, b.GetName(), b.API.Endpoints.URL)
+	log.Printf(sharedtestvalues.LiveTesting, b.Name, b.API.Endpoints.URL)
 	os.Exit(m.Run())
 }
diff --git a/exchanges/bitstamp/bitstamp_mock_test.go b/exchanges/bitstamp/bitstamp_mock_test.go
index d8b46e59..ffb3943f 100644
--- a/exchanges/bitstamp/bitstamp_mock_test.go
+++ b/exchanges/bitstamp/bitstamp_mock_test.go
@@ -47,6 +47,6 @@ func TestMain(m *testing.M) {
 	b.HTTPClient = newClient
 	b.API.Endpoints.URL = serverDetails + "/api"
 
-	log.Printf(sharedtestvalues.MockTesting, b.GetName(), b.API.Endpoints.URL)
+	log.Printf(sharedtestvalues.MockTesting, b.Name, b.API.Endpoints.URL)
 	os.Exit(m.Run())
 }
diff --git a/exchanges/bitstamp/bitstamp_wrapper.go b/exchanges/bitstamp/bitstamp_wrapper.go
index b269da78..bd647384 100644
--- a/exchanges/bitstamp/bitstamp_wrapper.go
+++ b/exchanges/bitstamp/bitstamp_wrapper.go
@@ -176,7 +176,7 @@ func (b *Bitstamp) Run() {
 	if b.Verbose {
 		log.Debugf(log.ExchangeSys,
 			"%s Websocket: %s.",
-			b.GetName(),
+			b.Name,
 			common.IsEnabled(b.Websocket.IsEnabled()))
 		b.PrintEnabledPairs()
 	}
@@ -245,7 +245,7 @@ func (b *Bitstamp) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.P
 		LastUpdated: time.Unix(tick.Timestamp, 0),
 	}
 
-	err = ticker.ProcessTicker(b.GetName(), &tickerPrice, assetType)
+	err = ticker.ProcessTicker(b.Name, &tickerPrice, assetType)
 	if err != nil {
 		return tickerPrice, err
 	}
@@ -255,7 +255,7 @@ func (b *Bitstamp) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.P
 
 // FetchTicker returns the ticker for a currency pair
 func (b *Bitstamp) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tick, err := ticker.GetTicker(b.GetName(), p, assetType)
+	tick, err := ticker.GetTicker(b.Name, p, assetType)
 	if err != nil {
 		return b.UpdateTicker(p, assetType)
 	}
@@ -273,7 +273,7 @@ func (b *Bitstamp) GetFeeByType(feeBuilder *exchange.FeeBuilder) (float64, error
 
 // FetchOrderbook returns the orderbook for a currency pair
 func (b *Bitstamp) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(b.GetName(), p, assetType)
+	ob, err := orderbook.Get(b.Name, p, assetType)
 	if err != nil {
 		return b.UpdateOrderbook(p, assetType)
 	}
@@ -299,7 +299,7 @@ func (b *Bitstamp) UpdateOrderbook(p currency.Pair, assetType asset.Item) (order
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = b.GetName()
+	orderBook.ExchangeName = b.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
@@ -314,7 +314,7 @@ func (b *Bitstamp) UpdateOrderbook(p currency.Pair, assetType asset.Item) (order
 // Bitstamp exchange
 func (b *Bitstamp) GetAccountInfo() (exchange.AccountInfo, error) {
 	var response exchange.AccountInfo
-	response.Exchange = b.GetName()
+	response.Exchange = b.Name
 	accountBalance, err := b.GetBalance()
 	if err != nil {
 		return response, err
diff --git a/exchanges/bittrex/bittrex_test.go b/exchanges/bittrex/bittrex_test.go
index 4f4179a1..32196f3f 100644
--- a/exchanges/bittrex/bittrex_test.go
+++ b/exchanges/bittrex/bittrex_test.go
@@ -21,7 +21,7 @@ var b Bittrex
 
 func TestSetDefaults(t *testing.T) {
 	b.SetDefaults()
-	if b.GetName() != "Bittrex" {
+	if b.Name != "Bittrex" {
 		t.Error("Bittrex - SetDefaults() error")
 	}
 }
diff --git a/exchanges/bittrex/bittrex_wrapper.go b/exchanges/bittrex/bittrex_wrapper.go
index d1b1d19b..15cef5ec 100644
--- a/exchanges/bittrex/bittrex_wrapper.go
+++ b/exchanges/bittrex/bittrex_wrapper.go
@@ -192,7 +192,7 @@ func (b *Bittrex) UpdateTradablePairs(forceUpdate bool) error {
 // Bittrex exchange
 func (b *Bittrex) GetAccountInfo() (exchange.AccountInfo, error) {
 	var response exchange.AccountInfo
-	response.Exchange = b.GetName()
+	response.Exchange = b.Name
 	accountBalance, err := b.GetAccountBalances()
 	if err != nil {
 		return response, err
@@ -240,7 +240,7 @@ func (b *Bittrex) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Pr
 				Pair:        pairs[i],
 				LastUpdated: tickerTime,
 			}
-			err = ticker.ProcessTicker(b.GetName(), &tickerPrice, assetType)
+			err = ticker.ProcessTicker(b.Name, &tickerPrice, assetType)
 			if err != nil {
 				log.Error(log.Ticker, err)
 			}
@@ -252,7 +252,7 @@ func (b *Bittrex) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Pr
 
 // FetchTicker returns the ticker for a currency pair
 func (b *Bittrex) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tick, err := ticker.GetTicker(b.GetName(), p, assetType)
+	tick, err := ticker.GetTicker(b.Name, p, assetType)
 	if err != nil {
 		return b.UpdateTicker(p, assetType)
 	}
@@ -261,7 +261,7 @@ func (b *Bittrex) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Pri
 
 // FetchOrderbook returns the orderbook for a currency pair
 func (b *Bittrex) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(b.GetName(), p, assetType)
+	ob, err := orderbook.Get(b.Name, p, assetType)
 	if err != nil {
 		return b.UpdateOrderbook(p, assetType)
 	}
@@ -295,7 +295,7 @@ func (b *Bittrex) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderb
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = b.GetName()
+	orderBook.ExchangeName = b.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
diff --git a/exchanges/btcmarkets/btcmarkets.go b/exchanges/btcmarkets/btcmarkets.go
index ff6ac360..88679ad6 100644
--- a/exchanges/btcmarkets/btcmarkets.go
+++ b/exchanges/btcmarkets/btcmarkets.go
@@ -138,7 +138,7 @@ func (b *BTCMarkets) NewOrder(instrument, currency string, price, amount float64
 	}
 
 	if !resp.Success {
-		return 0, fmt.Errorf("%s Unable to place order. Error message: %s", b.GetName(), resp.ErrorMessage)
+		return 0, fmt.Errorf("%s Unable to place order. Error message: %s", b.Name, resp.ErrorMessage)
 	}
 	return int64(resp.ID), nil
 }
@@ -159,7 +159,7 @@ func (b *BTCMarkets) CancelExistingOrder(orderID []int64) ([]ResponseDetails, er
 	}
 
 	if !resp.Success {
-		return resp.Responses, fmt.Errorf("%s Unable to cancel order. Error message: %s", b.GetName(), resp.ErrorMessage)
+		return resp.Responses, fmt.Errorf("%s Unable to cancel order. Error message: %s", b.Name, resp.ErrorMessage)
 	}
 
 	return resp.Responses, nil
diff --git a/exchanges/btcmarkets/btcmarkets_websocket.go b/exchanges/btcmarkets/btcmarkets_websocket.go
index 840a25c3..285eef43 100644
--- a/exchanges/btcmarkets/btcmarkets_websocket.go
+++ b/exchanges/btcmarkets/btcmarkets_websocket.go
@@ -30,7 +30,7 @@ func (b *BTCMarkets) WsConnect() error {
 		return err
 	}
 	if b.Verbose {
-		log.Debugf(log.ExchangeSys, "%s Connected to Websocket.\n", b.GetName())
+		log.Debugf(log.ExchangeSys, "%s Connected to Websocket.\n", b.Name)
 	}
 
 	b.generateDefaultSubscriptions()
@@ -66,7 +66,7 @@ func (b *BTCMarkets) WsHandleData() {
 			switch wsResponse.MessageType {
 			case "heartbeat":
 				if b.Verbose {
-					log.Debugf(log.ExchangeSys, "%v - Websocket heartbeat received %s", b.GetName(), resp.Raw)
+					log.Debugf(log.ExchangeSys, "%v - Websocket heartbeat received %s", b.Name, resp.Raw)
 				}
 			case "orderbook":
 				var ob WsOrderbook
@@ -127,7 +127,7 @@ func (b *BTCMarkets) WsHandleData() {
 				b.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
 					Pair:     p,
 					Asset:    asset.Spot,
-					Exchange: b.GetName(),
+					Exchange: b.Name,
 				}
 			case "trade":
 				var trade WsTrade
@@ -141,7 +141,7 @@ func (b *BTCMarkets) WsHandleData() {
 					Timestamp:    trade.Timestamp,
 					CurrencyPair: p,
 					AssetType:    asset.Spot,
-					Exchange:     b.GetName(),
+					Exchange:     b.Name,
 					Price:        trade.Price,
 					Amount:       trade.Volume,
 				}
@@ -155,7 +155,7 @@ func (b *BTCMarkets) WsHandleData() {
 
 				p := currency.NewPairFromString(tick.Currency)
 				b.Websocket.DataHandler <- wshandler.TickerData{
-					Exchange:  b.GetName(),
+					Exchange:  b.Name,
 					Volume:    tick.Volume,
 					High:      tick.High24,
 					Low:       tick.Low24h,
diff --git a/exchanges/btcmarkets/btcmarkets_wrapper.go b/exchanges/btcmarkets/btcmarkets_wrapper.go
index 83bdc268..21025ae3 100644
--- a/exchanges/btcmarkets/btcmarkets_wrapper.go
+++ b/exchanges/btcmarkets/btcmarkets_wrapper.go
@@ -243,7 +243,7 @@ func (b *BTCMarkets) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker
 		LastUpdated: time.Unix(tick.Timestamp, 0),
 	}
 
-	err = ticker.ProcessTicker(b.GetName(), &tickerPrice, assetType)
+	err = ticker.ProcessTicker(b.Name, &tickerPrice, assetType)
 	if err != nil {
 		return tickerPrice, err
 	}
@@ -253,7 +253,7 @@ func (b *BTCMarkets) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker
 
 // FetchTicker returns the ticker for a currency pair
 func (b *BTCMarkets) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker(b.GetName(), p, assetType)
+	tickerNew, err := ticker.GetTicker(b.Name, p, assetType)
 	if err != nil {
 		return b.UpdateTicker(p, assetType)
 	}
@@ -262,7 +262,7 @@ func (b *BTCMarkets) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.
 
 // FetchOrderbook returns orderbook base on the currency pair
 func (b *BTCMarkets) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(b.GetName(), p, assetType)
+	ob, err := orderbook.Get(b.Name, p, assetType)
 	if err != nil {
 		return b.UpdateOrderbook(p, assetType)
 	}
@@ -289,7 +289,7 @@ func (b *BTCMarkets) UpdateOrderbook(p currency.Pair, assetType asset.Item) (ord
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = b.GetName()
+	orderBook.ExchangeName = b.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
@@ -304,7 +304,7 @@ func (b *BTCMarkets) UpdateOrderbook(p currency.Pair, assetType asset.Item) (ord
 // BTCMarkets exchange
 func (b *BTCMarkets) GetAccountInfo() (exchange.AccountInfo, error) {
 	var response exchange.AccountInfo
-	response.Exchange = b.GetName()
+	response.Exchange = b.Name
 
 	accountBalance, err := b.GetAccountBalance()
 	if err != nil {
@@ -454,7 +454,7 @@ func (b *BTCMarkets) GetOrderInfo(orderID string) (order.Detail, error) {
 
 		OrderDetail.Amount = orders[i].Volume
 		OrderDetail.OrderDate = orderDate
-		OrderDetail.Exchange = b.GetName()
+		OrderDetail.Exchange = b.Name
 		OrderDetail.ID = strconv.FormatInt(orders[i].ID, 10)
 		OrderDetail.RemainingAmount = orders[i].OpenVolume
 		OrderDetail.OrderSide = side
diff --git a/exchanges/btse/btse_wrapper.go b/exchanges/btse/btse_wrapper.go
index 3753792e..d7e9fca3 100644
--- a/exchanges/btse/btse_wrapper.go
+++ b/exchanges/btse/btse_wrapper.go
@@ -244,7 +244,7 @@ func (b *BTSE) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Price
 	tickerPrice.High = s.High
 	tickerPrice.LastUpdated = s.Time
 
-	err = ticker.ProcessTicker(b.GetName(), &tickerPrice, assetType)
+	err = ticker.ProcessTicker(b.Name, &tickerPrice, assetType)
 	if err != nil {
 		return tickerPrice, err
 	}
@@ -253,7 +253,7 @@ func (b *BTSE) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Price
 
 // FetchTicker returns the ticker for a currency pair
 func (b *BTSE) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker(b.GetName(), p, assetType)
+	tickerNew, err := ticker.GetTicker(b.Name, p, assetType)
 	if err != nil {
 		return b.UpdateTicker(p, assetType)
 	}
@@ -262,7 +262,7 @@ func (b *BTSE) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price,
 
 // FetchOrderbook returns orderbook base on the currency pair
 func (b *BTSE) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(b.GetName(), p, assetType)
+	ob, err := orderbook.Get(b.Name, p, assetType)
 	if err != nil {
 		return b.UpdateOrderbook(p, assetType)
 	}
diff --git a/exchanges/coinbasepro/coinbasepro_websocket.go b/exchanges/coinbasepro/coinbasepro_websocket.go
index a94f9cda..7cd93295 100644
--- a/exchanges/coinbasepro/coinbasepro_websocket.go
+++ b/exchanges/coinbasepro/coinbasepro_websocket.go
@@ -216,7 +216,7 @@ func (c *CoinbasePro) ProcessSnapshot(snapshot *WebsocketOrderbookSnapshot) erro
 	pair := currency.NewPairFromString(snapshot.ProductID)
 	base.AssetType = asset.Spot
 	base.Pair = pair
-	base.ExchangeName = c.GetName()
+	base.ExchangeName = c.Name
 
 	err := c.Websocket.Orderbook.LoadSnapshot(&base)
 	if err != nil {
@@ -226,7 +226,7 @@ func (c *CoinbasePro) ProcessSnapshot(snapshot *WebsocketOrderbookSnapshot) erro
 	c.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
 		Pair:     pair,
 		Asset:    asset.Spot,
-		Exchange: c.GetName(),
+		Exchange: c.Name,
 	}
 
 	return nil
@@ -270,7 +270,7 @@ func (c *CoinbasePro) ProcessUpdate(update WebsocketL2Update) error {
 	c.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
 		Pair:     p,
 		Asset:    asset.Spot,
-		Exchange: c.GetName(),
+		Exchange: c.Name,
 	}
 
 	return nil
diff --git a/exchanges/coinbasepro/coinbasepro_wrapper.go b/exchanges/coinbasepro/coinbasepro_wrapper.go
index a039ccd7..dd687b04 100644
--- a/exchanges/coinbasepro/coinbasepro_wrapper.go
+++ b/exchanges/coinbasepro/coinbasepro_wrapper.go
@@ -189,7 +189,7 @@ func (c *CoinbasePro) Run() {
 	if c.Verbose {
 		log.Debugf(log.ExchangeSys,
 			"%s Websocket: %s. (url: %s).\n",
-			c.GetName(),
+			c.Name,
 			common.IsEnabled(c.Websocket.IsEnabled()),
 			coinbaseproWebsocketURL)
 		c.PrintEnabledPairs()
@@ -255,7 +255,7 @@ func (c *CoinbasePro) UpdateTradablePairs(forceUpdate bool) error {
 // coinbasepro exchange
 func (c *CoinbasePro) GetAccountInfo() (exchange.AccountInfo, error) {
 	var response exchange.AccountInfo
-	response.Exchange = c.GetName()
+	response.Exchange = c.Name
 	accountBalance, err := c.GetAccounts()
 	if err != nil {
 		return response, err
@@ -302,7 +302,7 @@ func (c *CoinbasePro) UpdateTicker(p currency.Pair, assetType asset.Item) (ticke
 		LastUpdated: tick.Time,
 	}
 
-	err = ticker.ProcessTicker(c.GetName(), &tickerPrice, assetType)
+	err = ticker.ProcessTicker(c.Name, &tickerPrice, assetType)
 	if err != nil {
 		return tickerPrice, err
 	}
@@ -312,7 +312,7 @@ func (c *CoinbasePro) UpdateTicker(p currency.Pair, assetType asset.Item) (ticke
 
 // FetchTicker returns the ticker for a currency pair
 func (c *CoinbasePro) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker(c.GetName(), p, assetType)
+	tickerNew, err := ticker.GetTicker(c.Name, p, assetType)
 	if err != nil {
 		return c.UpdateTicker(p, assetType)
 	}
@@ -321,7 +321,7 @@ func (c *CoinbasePro) FetchTicker(p currency.Pair, assetType asset.Item) (ticker
 
 // FetchOrderbook returns orderbook base on the currency pair
 func (c *CoinbasePro) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(c.GetName(), p, assetType)
+	ob, err := orderbook.Get(c.Name, p, assetType)
 	if err != nil {
 		return c.UpdateOrderbook(p, assetType)
 	}
@@ -348,7 +348,7 @@ func (c *CoinbasePro) UpdateOrderbook(p currency.Pair, assetType asset.Item) (or
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = c.GetName()
+	orderBook.ExchangeName = c.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
diff --git a/exchanges/coinut/coinut_websocket.go b/exchanges/coinut/coinut_websocket.go
index 44b170d5..9b0935dc 100644
--- a/exchanges/coinut/coinut_websocket.go
+++ b/exchanges/coinut/coinut_websocket.go
@@ -166,7 +166,7 @@ func (c *COINUT) wsProcessResponse(resp []byte) {
 		}
 		currencyPair := wsInstrumentMap.LookupInstrument(orderbooksnapshot.InstID)
 		c.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
-			Exchange: c.GetName(),
+			Exchange: c.Name,
 			Asset:    asset.Spot,
 			Pair: currency.NewPairFromFormattedPairs(currencyPair,
 				c.GetEnabledPairs(asset.Spot),
@@ -186,7 +186,7 @@ func (c *COINUT) wsProcessResponse(resp []byte) {
 		}
 		currencyPair := wsInstrumentMap.LookupInstrument(orderbookUpdate.InstID)
 		c.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
-			Exchange: c.GetName(),
+			Exchange: c.Name,
 			Asset:    asset.Spot,
 			Pair: currency.NewPairFromFormattedPairs(currencyPair,
 				c.GetEnabledPairs(asset.Spot),
@@ -214,7 +214,7 @@ func (c *COINUT) wsProcessResponse(resp []byte) {
 				c.GetEnabledPairs(asset.Spot),
 				c.GetPairFormat(asset.Spot, true)),
 			AssetType: asset.Spot,
-			Exchange:  c.GetName(),
+			Exchange:  c.Name,
 			Price:     tradeUpdate.Price,
 			Side:      tradeUpdate.Side,
 		}
@@ -290,7 +290,7 @@ func (c *COINUT) WsProcessOrderbookSnapshot(ob *WsOrderbookSnapshot) error {
 		c.GetPairFormat(asset.Spot, true),
 	)
 	newOrderBook.AssetType = asset.Spot
-	newOrderBook.ExchangeName = c.GetName()
+	newOrderBook.ExchangeName = c.Name
 
 	return c.Websocket.Orderbook.LoadSnapshot(&newOrderBook)
 }
diff --git a/exchanges/coinut/coinut_wrapper.go b/exchanges/coinut/coinut_wrapper.go
index c20b5a65..75779a48 100644
--- a/exchanges/coinut/coinut_wrapper.go
+++ b/exchanges/coinut/coinut_wrapper.go
@@ -182,7 +182,7 @@ func (c *COINUT) Start(wg *sync.WaitGroup) {
 // Run implements the COINUT wrapper
 func (c *COINUT) Run() {
 	if c.Verbose {
-		log.Debugf(log.ExchangeSys, "%s Websocket: %s. (url: %s).\n", c.GetName(), common.IsEnabled(c.Websocket.IsEnabled()), coinutWebsocketURL)
+		log.Debugf(log.ExchangeSys, "%s Websocket: %s. (url: %s).\n", c.Name, common.IsEnabled(c.Websocket.IsEnabled()), coinutWebsocketURL)
 		c.PrintEnabledPairs()
 	}
 
@@ -311,7 +311,7 @@ func (c *COINUT) GetAccountInfo() (exchange.AccountInfo, error) {
 			TotalValue:   bal.ZEC,
 		},
 	}
-	info.Exchange = c.GetName()
+	info.Exchange = c.Name
 	info.Accounts = append(info.Accounts, exchange.Account{
 		Currencies: balances,
 	})
@@ -350,7 +350,7 @@ func (c *COINUT) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Pri
 		Pair:        p,
 		LastUpdated: time.Unix(0, tick.Timestamp),
 	}
-	err = ticker.ProcessTicker(c.GetName(), &tickerPrice, assetType)
+	err = ticker.ProcessTicker(c.Name, &tickerPrice, assetType)
 	if err != nil {
 		return tickerPrice, err
 	}
@@ -360,7 +360,7 @@ func (c *COINUT) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Pri
 
 // FetchTicker returns the ticker for a currency pair
 func (c *COINUT) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker(c.GetName(), p, assetType)
+	tickerNew, err := ticker.GetTicker(c.Name, p, assetType)
 	if err != nil {
 		return c.UpdateTicker(p, assetType)
 	}
@@ -369,7 +369,7 @@ func (c *COINUT) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Pric
 
 // FetchOrderbook returns orderbook base on the currency pair
 func (c *COINUT) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(c.GetName(), p, assetType)
+	ob, err := orderbook.Get(c.Name, p, assetType)
 	if err != nil {
 		return c.UpdateOrderbook(p, assetType)
 	}
@@ -407,7 +407,7 @@ func (c *COINUT) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderbo
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = c.GetName()
+	orderBook.ExchangeName = c.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
diff --git a/exchanges/exmo/exmo_wrapper.go b/exchanges/exmo/exmo_wrapper.go
index 2486a3c7..c2b79d2b 100644
--- a/exchanges/exmo/exmo_wrapper.go
+++ b/exchanges/exmo/exmo_wrapper.go
@@ -209,7 +209,7 @@ func (e *EXMO) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Price
 
 // FetchTicker returns the ticker for a currency pair
 func (e *EXMO) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tick, err := ticker.GetTicker(e.GetName(), p, assetType)
+	tick, err := ticker.GetTicker(e.Name, p, assetType)
 	if err != nil {
 		return e.UpdateTicker(p, assetType)
 	}
@@ -218,7 +218,7 @@ func (e *EXMO) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price,
 
 // FetchOrderbook returns the orderbook for a currency pair
 func (e *EXMO) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(e.GetName(), p, assetType)
+	ob, err := orderbook.Get(e.Name, p, assetType)
 	if err != nil {
 		return e.UpdateOrderbook(p, assetType)
 	}
@@ -267,7 +267,7 @@ func (e *EXMO) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderbook
 
 		orderBook.Bids = obItems
 		orderBook.Pair = x
-		orderBook.ExchangeName = e.GetName()
+		orderBook.ExchangeName = e.Name
 		orderBook.AssetType = assetType
 
 		err = orderBook.Process()
@@ -282,7 +282,7 @@ func (e *EXMO) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderbook
 // Exmo exchange
 func (e *EXMO) GetAccountInfo() (exchange.AccountInfo, error) {
 	var response exchange.AccountInfo
-	response.Exchange = e.GetName()
+	response.Exchange = e.Name
 	result, err := e.GetUserInfo()
 	if err != nil {
 		return response, err
diff --git a/exchanges/gateio/gateio_websocket.go b/exchanges/gateio/gateio_websocket.go
index 49d4221e..75347608 100644
--- a/exchanges/gateio/gateio_websocket.go
+++ b/exchanges/gateio/gateio_websocket.go
@@ -168,7 +168,7 @@ func (g *Gateio) WsHandleData() {
 						Timestamp:    time.Now(),
 						CurrencyPair: currency.NewPairFromString(c),
 						AssetType:    asset.Spot,
-						Exchange:     g.GetName(),
+						Exchange:     g.Name,
 						Price:        trades[i].Price,
 						Amount:       trades[i].Amount,
 						Side:         trades[i].Type,
@@ -237,7 +237,7 @@ func (g *Gateio) WsHandleData() {
 					newOrderBook.Bids = bids
 					newOrderBook.AssetType = asset.Spot
 					newOrderBook.Pair = currency.NewPairFromString(c)
-					newOrderBook.ExchangeName = g.GetName()
+					newOrderBook.ExchangeName = g.Name
 
 					err = g.Websocket.Orderbook.LoadSnapshot(&newOrderBook)
 					if err != nil {
@@ -260,7 +260,7 @@ func (g *Gateio) WsHandleData() {
 				g.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
 					Pair:     currency.NewPairFromString(c),
 					Asset:    asset.Spot,
-					Exchange: g.GetName(),
+					Exchange: g.Name,
 				}
 
 			case strings.Contains(result.Method, "kline"):
@@ -281,7 +281,7 @@ func (g *Gateio) WsHandleData() {
 					Timestamp:  time.Now(),
 					Pair:       currency.NewPairFromString(data[7].(string)),
 					AssetType:  asset.Spot,
-					Exchange:   g.GetName(),
+					Exchange:   g.Name,
 					OpenPrice:  open,
 					ClosePrice: closePrice,
 					HighPrice:  high,
diff --git a/exchanges/gateio/gateio_wrapper.go b/exchanges/gateio/gateio_wrapper.go
index e8308b97..f3d894fd 100644
--- a/exchanges/gateio/gateio_wrapper.go
+++ b/exchanges/gateio/gateio_wrapper.go
@@ -250,7 +250,7 @@ func (g *Gateio) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Pri
 
 // FetchTicker returns the ticker for a currency pair
 func (g *Gateio) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker(g.GetName(), p, assetType)
+	tickerNew, err := ticker.GetTicker(g.Name, p, assetType)
 	if err != nil {
 		return g.UpdateTicker(p, assetType)
 	}
@@ -259,7 +259,7 @@ func (g *Gateio) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Pric
 
 // FetchOrderbook returns orderbook base on the currency pair
 func (g *Gateio) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(g.GetName(), p, assetType)
+	ob, err := orderbook.Get(g.Name, p, assetType)
 	if err != nil {
 		return g.UpdateOrderbook(p, assetType)
 	}
@@ -287,7 +287,7 @@ func (g *Gateio) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderbo
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = g.GetName()
+	orderBook.ExchangeName = g.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
@@ -358,7 +358,7 @@ func (g *Gateio) GetAccountInfo() (exchange.AccountInfo, error) {
 		Currencies: balances,
 	})
 
-	info.Exchange = g.GetName()
+	info.Exchange = g.Name
 
 	return info, nil
 }
@@ -463,7 +463,7 @@ func (g *Gateio) GetOrderInfo(orderID string) (order.Detail, error) {
 		if orders.Orders[x].OrderNumber != orderID {
 			continue
 		}
-		orderDetail.Exchange = g.GetName()
+		orderDetail.Exchange = g.Name
 		orderDetail.ID = orders.Orders[x].OrderNumber
 		orderDetail.RemainingAmount = orders.Orders[x].InitialAmount - orders.Orders[x].FilledAmount
 		orderDetail.ExecutedAmount = orders.Orders[x].FilledAmount
diff --git a/exchanges/gemini/gemini_live_test.go b/exchanges/gemini/gemini_live_test.go
index cf5daf3e..522fda2e 100644
--- a/exchanges/gemini/gemini_live_test.go
+++ b/exchanges/gemini/gemini_live_test.go
@@ -34,6 +34,6 @@ func TestMain(m *testing.M) {
 		log.Fatal("Gemini setup error", err)
 	}
 	g.API.Endpoints.URL = geminiSandboxAPIURL
-	log.Printf(sharedtestvalues.LiveTesting, g.GetName(), g.API.Endpoints.URL)
+	log.Printf(sharedtestvalues.LiveTesting, g.Name, g.API.Endpoints.URL)
 	os.Exit(m.Run())
 }
diff --git a/exchanges/gemini/gemini_mock_test.go b/exchanges/gemini/gemini_mock_test.go
index 6b56984a..c7982e5c 100644
--- a/exchanges/gemini/gemini_mock_test.go
+++ b/exchanges/gemini/gemini_mock_test.go
@@ -46,6 +46,6 @@ func TestMain(m *testing.M) {
 	g.HTTPClient = newClient
 	g.API.Endpoints.URL = serverDetails
 
-	log.Printf(sharedtestvalues.MockTesting, g.GetName(), g.API.Endpoints.URL)
+	log.Printf(sharedtestvalues.MockTesting, g.Name, g.API.Endpoints.URL)
 	os.Exit(m.Run())
 }
diff --git a/exchanges/gemini/gemini_websocket.go b/exchanges/gemini/gemini_websocket.go
index 681d839c..c4926252 100644
--- a/exchanges/gemini/gemini_websocket.go
+++ b/exchanges/gemini/gemini_websocket.go
@@ -283,7 +283,7 @@ func (g *Gemini) wsProcessUpdate(result WsMarketUpdateResponse, pair currency.Pa
 		newOrderBook.Bids = bids
 		newOrderBook.AssetType = asset.Spot
 		newOrderBook.Pair = pair
-		newOrderBook.ExchangeName = g.GetName()
+		newOrderBook.ExchangeName = g.Name
 		err := g.Websocket.Orderbook.LoadSnapshot(&newOrderBook)
 		if err != nil {
 			g.Websocket.DataHandler <- err
@@ -291,7 +291,7 @@ func (g *Gemini) wsProcessUpdate(result WsMarketUpdateResponse, pair currency.Pa
 		}
 		g.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{Pair: pair,
 			Asset:    asset.Spot,
-			Exchange: g.GetName()}
+			Exchange: g.Name}
 	} else {
 		var asks, bids []orderbook.Item
 		for i := 0; i < len(result.Events); i++ {
@@ -330,6 +330,6 @@ func (g *Gemini) wsProcessUpdate(result WsMarketUpdateResponse, pair currency.Pa
 		}
 		g.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{Pair: pair,
 			Asset:    asset.Spot,
-			Exchange: g.GetName()}
+			Exchange: g.Name}
 	}
 }
diff --git a/exchanges/gemini/gemini_wrapper.go b/exchanges/gemini/gemini_wrapper.go
index f0763251..1596393d 100644
--- a/exchanges/gemini/gemini_wrapper.go
+++ b/exchanges/gemini/gemini_wrapper.go
@@ -212,7 +212,7 @@ func (g *Gemini) UpdateTradablePairs(forceUpdate bool) error {
 // Gemini exchange
 func (g *Gemini) GetAccountInfo() (exchange.AccountInfo, error) {
 	var response exchange.AccountInfo
-	response.Exchange = g.GetName()
+	response.Exchange = g.Name
 	accountBalance, err := g.GetBalances()
 	if err != nil {
 		return response, err
@@ -250,7 +250,7 @@ func (g *Gemini) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Pri
 		Close: tick.Close,
 		Pair:  p,
 	}
-	err = ticker.ProcessTicker(g.GetName(), &tickerPrice, assetType)
+	err = ticker.ProcessTicker(g.Name, &tickerPrice, assetType)
 	if err != nil {
 		return tickerPrice, err
 	}
@@ -260,7 +260,7 @@ func (g *Gemini) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Pri
 
 // FetchTicker returns the ticker for a currency pair
 func (g *Gemini) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker(g.GetName(), p, assetType)
+	tickerNew, err := ticker.GetTicker(g.Name, p, assetType)
 	if err != nil {
 		return g.UpdateTicker(p, assetType)
 	}
@@ -269,7 +269,7 @@ func (g *Gemini) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Pric
 
 // FetchOrderbook returns orderbook base on the currency pair
 func (g *Gemini) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(g.GetName(), p, assetType)
+	ob, err := orderbook.Get(g.Name, p, assetType)
 	if err != nil {
 		return g.UpdateOrderbook(p, assetType)
 	}
@@ -293,7 +293,7 @@ func (g *Gemini) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderbo
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = g.GetName()
+	orderBook.ExchangeName = g.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
diff --git a/exchanges/hitbtc/hitbtc_websocket.go b/exchanges/hitbtc/hitbtc_websocket.go
index 5726ca8a..99d7c296 100644
--- a/exchanges/hitbtc/hitbtc_websocket.go
+++ b/exchanges/hitbtc/hitbtc_websocket.go
@@ -250,7 +250,7 @@ func (h *HitBTC) WsProcessOrderbookSnapshot(ob WsOrderbook) error {
 	newOrderBook.Bids = bids
 	newOrderBook.AssetType = asset.Spot
 	newOrderBook.Pair = p
-	newOrderBook.ExchangeName = h.GetName()
+	newOrderBook.ExchangeName = h.Name
 
 	err := h.Websocket.Orderbook.LoadSnapshot(&newOrderBook)
 	if err != nil {
@@ -258,7 +258,7 @@ func (h *HitBTC) WsProcessOrderbookSnapshot(ob WsOrderbook) error {
 	}
 
 	h.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
-		Exchange: h.GetName(),
+		Exchange: h.Name,
 		Asset:    asset.Spot,
 		Pair:     p,
 	}
@@ -295,7 +295,7 @@ func (h *HitBTC) WsProcessOrderbookUpdate(update WsOrderbook) error {
 	}
 
 	h.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
-		Exchange: h.GetName(),
+		Exchange: h.Name,
 		Asset:    asset.Spot,
 		Pair:     p,
 	}
diff --git a/exchanges/hitbtc/hitbtc_wrapper.go b/exchanges/hitbtc/hitbtc_wrapper.go
index b4e829ac..98fe7b7a 100644
--- a/exchanges/hitbtc/hitbtc_wrapper.go
+++ b/exchanges/hitbtc/hitbtc_wrapper.go
@@ -186,7 +186,7 @@ func (h *HitBTC) Start(wg *sync.WaitGroup) {
 // Run implements the HitBTC wrapper
 func (h *HitBTC) Run() {
 	if h.Verbose {
-		log.Debugf(log.ExchangeSys, "%s Websocket: %s (url: %s).\n", h.GetName(), common.IsEnabled(h.Websocket.IsEnabled()), hitbtcWebsocketAddress)
+		log.Debugf(log.ExchangeSys, "%s Websocket: %s (url: %s).\n", h.Name, common.IsEnabled(h.Websocket.IsEnabled()), hitbtcWebsocketAddress)
 		h.PrintEnabledPairs()
 	}
 
@@ -199,7 +199,7 @@ func (h *HitBTC) Run() {
 
 		err := h.UpdatePairs(currency.NewPairsFromStrings(enabledPairs), asset.Spot, true, true)
 		if err != nil {
-			log.Errorf(log.ExchangeSys, "%s failed to update enabled currencies.\n", h.GetName())
+			log.Errorf(log.ExchangeSys, "%s failed to update enabled currencies.\n", h.Name)
 		}
 	}
 
@@ -273,7 +273,7 @@ func (h *HitBTC) UpdateTicker(currencyPair currency.Pair, assetType asset.Item)
 				Pair:        pairs[i],
 				LastUpdated: tick[j].Timestamp,
 			}
-			err = ticker.ProcessTicker(h.GetName(), &tickerPrice, assetType)
+			err = ticker.ProcessTicker(h.Name, &tickerPrice, assetType)
 			if err != nil {
 				log.Error(log.Ticker, err)
 			}
@@ -284,7 +284,7 @@ func (h *HitBTC) UpdateTicker(currencyPair currency.Pair, assetType asset.Item)
 
 // FetchTicker returns the ticker for a currency pair
 func (h *HitBTC) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker(h.GetName(), p, assetType)
+	tickerNew, err := ticker.GetTicker(h.Name, p, assetType)
 	if err != nil {
 		return h.UpdateTicker(p, assetType)
 	}
@@ -293,7 +293,7 @@ func (h *HitBTC) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Pric
 
 // FetchOrderbook returns orderbook base on the currency pair
 func (h *HitBTC) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(h.GetName(), p, assetType)
+	ob, err := orderbook.Get(h.Name, p, assetType)
 	if err != nil {
 		return h.UpdateOrderbook(p, assetType)
 	}
@@ -319,7 +319,7 @@ func (h *HitBTC) UpdateOrderbook(currencyPair currency.Pair, assetType asset.Ite
 	}
 
 	orderBook.Pair = currencyPair
-	orderBook.ExchangeName = h.GetName()
+	orderBook.ExchangeName = h.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
@@ -334,7 +334,7 @@ func (h *HitBTC) UpdateOrderbook(currencyPair currency.Pair, assetType asset.Ite
 // HitBTC exchange
 func (h *HitBTC) GetAccountInfo() (exchange.AccountInfo, error) {
 	var response exchange.AccountInfo
-	response.Exchange = h.GetName()
+	response.Exchange = h.Name
 	accountBalance, err := h.GetBalances()
 	if err != nil {
 		return response, err
diff --git a/exchanges/huobi/huobi_websocket.go b/exchanges/huobi/huobi_websocket.go
index e6675735..0b1d8cec 100644
--- a/exchanges/huobi/huobi_websocket.go
+++ b/exchanges/huobi/huobi_websocket.go
@@ -251,7 +251,7 @@ func (h *HUOBI) wsHandleMarketData(resp WsMessage) {
 		data := strings.Split(kline.Channel, ".")
 		h.Websocket.DataHandler <- wshandler.KlineData{
 			Timestamp: time.Unix(0, kline.Timestamp),
-			Exchange:  h.GetName(),
+			Exchange:  h.Name,
 			AssetType: asset.Spot,
 			Pair: currency.NewPairFromFormattedPairs(data[1],
 				h.GetEnabledPairs(asset.Spot), h.GetPairFormat(asset.Spot, true)),
@@ -270,7 +270,7 @@ func (h *HUOBI) wsHandleMarketData(resp WsMessage) {
 		}
 		data := strings.Split(trade.Channel, ".")
 		h.Websocket.DataHandler <- wshandler.TradeData{
-			Exchange:  h.GetName(),
+			Exchange:  h.Name,
 			AssetType: asset.Spot,
 			CurrencyPair: currency.NewPairFromFormattedPairs(data[1],
 				h.GetEnabledPairs(asset.Spot), h.GetPairFormat(asset.Spot, true)),
@@ -335,7 +335,7 @@ func (h *HUOBI) WsProcessOrderbook(update *WsDepth, symbol string) error {
 
 	h.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
 		Pair:     p,
-		Exchange: h.GetName(),
+		Exchange: h.Name,
 		Asset:    asset.Spot,
 	}
 	return nil
diff --git a/exchanges/huobi/huobi_wrapper.go b/exchanges/huobi/huobi_wrapper.go
index 8c68e079..bc918852 100644
--- a/exchanges/huobi/huobi_wrapper.go
+++ b/exchanges/huobi/huobi_wrapper.go
@@ -196,7 +196,7 @@ func (h *HUOBI) Run() {
 	if h.Verbose {
 		log.Debugf(log.ExchangeSys,
 			"%s Websocket: %s (url: %s).\n",
-			h.GetName(),
+			h.Name,
 			common.IsEnabled(h.Websocket.IsEnabled()),
 			wsMarketURL)
 		h.PrintEnabledPairs()
@@ -236,7 +236,7 @@ func (h *HUOBI) Run() {
 		if err != nil {
 			log.Errorf(log.ExchangeSys,
 				"%s Failed to update enabled currencies.\n",
-				h.GetName())
+				h.Name)
 		}
 	}
 
@@ -310,7 +310,7 @@ func (h *HUOBI) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Pric
 				Close:  tickers.Data[j].Close,
 				Pair:   pairs[i],
 			}
-			err = ticker.ProcessTicker(h.GetName(), &tickerPrice, assetType)
+			err = ticker.ProcessTicker(h.Name, &tickerPrice, assetType)
 			if err != nil {
 				log.Error(log.Ticker, err)
 			}
@@ -322,7 +322,7 @@ func (h *HUOBI) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Pric
 
 // FetchTicker returns the ticker for a currency pair
 func (h *HUOBI) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker(h.GetName(), p, assetType)
+	tickerNew, err := ticker.GetTicker(h.Name, p, assetType)
 	if err != nil {
 		return h.UpdateTicker(p, assetType)
 	}
@@ -331,7 +331,7 @@ func (h *HUOBI) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price
 
 // FetchOrderbook returns orderbook base on the currency pair
 func (h *HUOBI) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(h.GetName(), p, assetType)
+	ob, err := orderbook.Get(h.Name, p, assetType)
 	if err != nil {
 		return h.UpdateOrderbook(p, assetType)
 	}
@@ -360,7 +360,7 @@ func (h *HUOBI) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderboo
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = h.GetName()
+	orderBook.ExchangeName = h.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
@@ -389,7 +389,7 @@ func (h *HUOBI) GetAccountID() ([]Account, error) {
 // HUOBI exchange - to-do
 func (h *HUOBI) GetAccountInfo() (exchange.AccountInfo, error) {
 	var info exchange.AccountInfo
-	info.Exchange = h.GetName()
+	info.Exchange = h.Name
 
 	accounts, err := h.GetAccountID()
 	if err != nil {
diff --git a/exchanges/itbit/itbit_wrapper.go b/exchanges/itbit/itbit_wrapper.go
index 72c5f2be..a10a6a09 100644
--- a/exchanges/itbit/itbit_wrapper.go
+++ b/exchanges/itbit/itbit_wrapper.go
@@ -158,7 +158,7 @@ func (i *ItBit) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Pric
 		Pair:        p,
 		LastUpdated: tick.ServertimeUTC,
 	}
-	err = ticker.ProcessTicker(i.GetName(), &tickerPrice, assetType)
+	err = ticker.ProcessTicker(i.Name, &tickerPrice, assetType)
 	if err != nil {
 		return tickerPrice, err
 	}
@@ -168,7 +168,7 @@ func (i *ItBit) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Pric
 
 // FetchTicker returns the ticker for a currency pair
 func (i *ItBit) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker(i.GetName(), p, assetType)
+	tickerNew, err := ticker.GetTicker(i.Name, p, assetType)
 	if err != nil {
 		return i.UpdateTicker(p, assetType)
 	}
@@ -177,7 +177,7 @@ func (i *ItBit) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price
 
 // FetchOrderbook returns orderbook base on the currency pair
 func (i *ItBit) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(i.GetName(), p, assetType)
+	ob, err := orderbook.Get(i.Name, p, assetType)
 	if err != nil {
 		return i.UpdateOrderbook(p, assetType)
 	}
@@ -229,7 +229,7 @@ func (i *ItBit) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderboo
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = i.GetName()
+	orderBook.ExchangeName = i.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
@@ -243,7 +243,7 @@ func (i *ItBit) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderboo
 // GetAccountInfo retrieves balances for all enabled currencies
 func (i *ItBit) GetAccountInfo() (exchange.AccountInfo, error) {
 	var info exchange.AccountInfo
-	info.Exchange = i.GetName()
+	info.Exchange = i.Name
 
 	wallets, err := i.GetWallets(url.Values{})
 	if err != nil {
diff --git a/exchanges/kraken/kraken_wrapper.go b/exchanges/kraken/kraken_wrapper.go
index 22f6cf75..b4282ea1 100644
--- a/exchanges/kraken/kraken_wrapper.go
+++ b/exchanges/kraken/kraken_wrapper.go
@@ -307,12 +307,12 @@ func (k *Kraken) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Pri
 			}
 		}
 	}
-	return ticker.GetTicker(k.GetName(), p, assetType)
+	return ticker.GetTicker(k.Name, p, assetType)
 }
 
 // FetchTicker returns the ticker for a currency pair
 func (k *Kraken) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker(k.GetName(), p, assetType)
+	tickerNew, err := ticker.GetTicker(k.Name, p, assetType)
 	if err != nil {
 		return k.UpdateTicker(p, assetType)
 	}
@@ -321,7 +321,7 @@ func (k *Kraken) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Pric
 
 // FetchOrderbook returns orderbook base on the currency pair
 func (k *Kraken) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(k.GetName(), p, assetType)
+	ob, err := orderbook.Get(k.Name, p, assetType)
 	if err != nil {
 		return k.UpdateOrderbook(p, assetType)
 	}
@@ -346,7 +346,7 @@ func (k *Kraken) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderbo
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = k.GetName()
+	orderBook.ExchangeName = k.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
@@ -361,7 +361,7 @@ func (k *Kraken) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderbo
 // Kraken exchange - to-do
 func (k *Kraken) GetAccountInfo() (exchange.AccountInfo, error) {
 	var info exchange.AccountInfo
-	info.Exchange = k.GetName()
+	info.Exchange = k.Name
 
 	bal, err := k.GetBalance()
 	if err != nil {
diff --git a/exchanges/lakebtc/lakebtc_websocket.go b/exchanges/lakebtc/lakebtc_websocket.go
index 1e3003ba..af662d9c 100644
--- a/exchanges/lakebtc/lakebtc_websocket.go
+++ b/exchanges/lakebtc/lakebtc_websocket.go
@@ -57,15 +57,15 @@ func (l *LakeBTC) listenToEndpoints() error {
 	var err error
 	l.WebsocketConn.Ticker, err = l.WebsocketConn.Client.Bind("tickers")
 	if err != nil {
-		return fmt.Errorf("%s Websocket Bind error: %s", l.GetName(), err)
+		return fmt.Errorf("%s Websocket Bind error: %s", l.Name, err)
 	}
 	l.WebsocketConn.Orderbook, err = l.WebsocketConn.Client.Bind("update")
 	if err != nil {
-		return fmt.Errorf("%s Websocket Bind error: %s", l.GetName(), err)
+		return fmt.Errorf("%s Websocket Bind error: %s", l.Name, err)
 	}
 	l.WebsocketConn.Trade, err = l.WebsocketConn.Client.Bind("trades")
 	if err != nil {
-		return fmt.Errorf("%s Websocket Bind error: %s", l.GetName(), err)
+		return fmt.Errorf("%s Websocket Bind error: %s", l.Name, err)
 	}
 	return nil
 }
@@ -152,7 +152,7 @@ func (l *LakeBTC) processTrades(data, channel string) error {
 			Timestamp:    time.Unix(tradeData.Trades[i].Date, 0),
 			CurrencyPair: curr,
 			AssetType:    asset.Spot,
-			Exchange:     l.GetName(),
+			Exchange:     l.Name,
 			EventType:    asset.Spot.String(),
 			EventTime:    tradeData.Trades[i].Date,
 			Price:        tradeData.Trades[i].Price,
diff --git a/exchanges/localbitcoins/localbitcoins_live_test.go b/exchanges/localbitcoins/localbitcoins_live_test.go
index 332da00d..be9fe318 100644
--- a/exchanges/localbitcoins/localbitcoins_live_test.go
+++ b/exchanges/localbitcoins/localbitcoins_live_test.go
@@ -33,6 +33,6 @@ func TestMain(m *testing.M) {
 	if err != nil {
 		log.Fatal("Localbitcoins setup error", err)
 	}
-	log.Printf(sharedtestvalues.LiveTesting, l.GetName(), l.API.Endpoints.URL)
+	log.Printf(sharedtestvalues.LiveTesting, l.Name, l.API.Endpoints.URL)
 	os.Exit(m.Run())
 }
diff --git a/exchanges/localbitcoins/localbitcoins_mock_test.go b/exchanges/localbitcoins/localbitcoins_mock_test.go
index 40992afe..83c0b23d 100644
--- a/exchanges/localbitcoins/localbitcoins_mock_test.go
+++ b/exchanges/localbitcoins/localbitcoins_mock_test.go
@@ -46,6 +46,6 @@ func TestMain(m *testing.M) {
 	l.HTTPClient = newClient
 	l.API.Endpoints.URL = serverDetails
 
-	log.Printf(sharedtestvalues.MockTesting, l.GetName(), l.API.Endpoints.URL)
+	log.Printf(sharedtestvalues.MockTesting, l.Name, l.API.Endpoints.URL)
 	os.Exit(m.Run())
 }
diff --git a/exchanges/localbitcoins/localbitcoins_wrapper.go b/exchanges/localbitcoins/localbitcoins_wrapper.go
index 36ff2ed1..e03ac508 100644
--- a/exchanges/localbitcoins/localbitcoins_wrapper.go
+++ b/exchanges/localbitcoins/localbitcoins_wrapper.go
@@ -182,18 +182,18 @@ func (l *LocalBitcoins) UpdateTicker(p currency.Pair, assetType asset.Item) (tic
 		tp.Last = tick[curr].Avg24h
 		tp.Volume = tick[curr].VolumeBTC
 
-		err = ticker.ProcessTicker(l.GetName(), &tp, assetType)
+		err = ticker.ProcessTicker(l.Name, &tp, assetType)
 		if err != nil {
 			log.Error(log.Ticker, err)
 		}
 	}
 
-	return ticker.GetTicker(l.GetName(), p, assetType)
+	return ticker.GetTicker(l.Name, p, assetType)
 }
 
 // FetchTicker returns the ticker for a currency pair
 func (l *LocalBitcoins) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker(l.GetName(), p, assetType)
+	tickerNew, err := ticker.GetTicker(l.Name, p, assetType)
 	if err != nil {
 		return l.UpdateTicker(p, assetType)
 	}
@@ -202,7 +202,7 @@ func (l *LocalBitcoins) FetchTicker(p currency.Pair, assetType asset.Item) (tick
 
 // FetchOrderbook returns orderbook base on the currency pair
 func (l *LocalBitcoins) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(l.GetName(), p, assetType)
+	ob, err := orderbook.Get(l.Name, p, assetType)
 	if err != nil {
 		return l.UpdateOrderbook(p, assetType)
 	}
@@ -228,7 +228,7 @@ func (l *LocalBitcoins) UpdateOrderbook(p currency.Pair, assetType asset.Item) (
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = l.GetName()
+	orderBook.ExchangeName = l.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
@@ -243,7 +243,7 @@ func (l *LocalBitcoins) UpdateOrderbook(p currency.Pair, assetType asset.Item) (
 // LocalBitcoins exchange
 func (l *LocalBitcoins) GetAccountInfo() (exchange.AccountInfo, error) {
 	var response exchange.AccountInfo
-	response.Exchange = l.GetName()
+	response.Exchange = l.Name
 	accountBalance, err := l.GetWalletBalance()
 	if err != nil {
 		return response, err
diff --git a/exchanges/mock/README.md b/exchanges/mock/README.md
index d8eea5c3..9f9e7422 100644
--- a/exchanges/mock/README.md
+++ b/exchanges/mock/README.md
@@ -63,7 +63,7 @@ func TestMain(m *testing.M) {
 	your_current_exchange_nameConfig.APISecret = apiSecret
 	l.SetDefaults()
 	l.Setup(&your_current_exchange_nameConfig)
-	log.Printf(sharedtestvalues.LiveTesting, l.GetName(), l.APIUrl)
+	log.Printf(sharedtestvalues.LiveTesting, l.Name, l.APIUrl)
 	os.Exit(m.Run())
 }
 ```
@@ -112,7 +112,7 @@ func TestMain(m *testing.M) {
 	g.HTTPClient = newClient
 	g.APIUrl = serverDetails
 
-	log.Printf(sharedtestvalues.MockTesting, l.GetName(), l.APIUrl)
+	log.Printf(sharedtestvalues.MockTesting, l.Name, l.APIUrl)
 	os.Exit(m.Run())
 }
 
diff --git a/exchanges/okcoin/okcoin_test.go b/exchanges/okcoin/okcoin_test.go
index 79659e55..19849b0b 100644
--- a/exchanges/okcoin/okcoin_test.go
+++ b/exchanges/okcoin/okcoin_test.go
@@ -38,7 +38,7 @@ func TestSetDefaults(t *testing.T) {
 	if o.Name != OKGroupExchange {
 		o.SetDefaults()
 	}
-	if o.GetName() != OKGroupExchange {
+	if o.Name != OKGroupExchange {
 		t.Errorf("%v - SetDefaults() error", OKGroupExchange)
 	}
 	TestSetup(t)
diff --git a/exchanges/okex/okex_test.go b/exchanges/okex/okex_test.go
index a4f75553..8ae4cb93 100644
--- a/exchanges/okex/okex_test.go
+++ b/exchanges/okex/okex_test.go
@@ -39,7 +39,7 @@ func TestSetDefaults(t *testing.T) {
 	if o.Name != OKGroupExchange {
 		o.SetDefaults()
 	}
-	if o.GetName() != OKGroupExchange {
+	if o.Name != OKGroupExchange {
 		t.Errorf("%v - SetDefaults() error", OKGroupExchange)
 	}
 	TestSetup(t)
diff --git a/exchanges/okgroup/okgroup_websocket.go b/exchanges/okgroup/okgroup_websocket.go
index b1c794ba..8aa944ad 100644
--- a/exchanges/okgroup/okgroup_websocket.go
+++ b/exchanges/okgroup/okgroup_websocket.go
@@ -445,7 +445,7 @@ func (o *OKGroup) wsProcessTrades(response *WebsocketDataResponse) {
 			AssetType:    o.GetAssetTypeFromTableName(response.Table),
 			CurrencyPair: c,
 			EventTime:    time.Now().Unix(),
-			Exchange:     o.GetName(),
+			Exchange:     o.Name,
 			Price:        response.Data[i].WebsocketTradeResponse.Price,
 			Side:         response.Data[i].Side,
 			Timestamp:    response.Data[i].Timestamp,
@@ -486,7 +486,7 @@ func (o *OKGroup) wsProcessCandles(response *WebsocketDataResponse) {
 		klineData := wshandler.KlineData{
 			AssetType: o.GetAssetTypeFromTableName(response.Table),
 			Pair:      c,
-			Exchange:  o.GetName(),
+			Exchange:  o.Name,
 			Timestamp: timeData,
 			Interval:  candleInterval,
 		}
@@ -602,7 +602,7 @@ func (o *OKGroup) WsProcessPartialOrderBook(wsEventData *WebsocketDataWrapper, i
 		AssetType:    a,
 		LastUpdated:  wsEventData.Timestamp,
 		Pair:         instrument,
-		ExchangeName: o.GetName(),
+		ExchangeName: o.Name,
 	}
 
 	err = o.Websocket.Orderbook.LoadSnapshot(&newOrderBook)
@@ -611,7 +611,7 @@ func (o *OKGroup) WsProcessPartialOrderBook(wsEventData *WebsocketDataWrapper, i
 	}
 
 	o.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
-		Exchange: o.GetName(),
+		Exchange: o.Name,
 		Asset:    a,
 		Pair:     instrument,
 	}
@@ -654,7 +654,7 @@ func (o *OKGroup) WsProcessUpdateOrderbook(wsEventData *WebsocketDataWrapper, in
 	}
 
 	o.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
-		Exchange: o.GetName(),
+		Exchange: o.Name,
 		Asset:    a,
 		Pair:     instrument,
 	}
diff --git a/exchanges/okgroup/okgroup_wrapper.go b/exchanges/okgroup/okgroup_wrapper.go
index 5f7a85f8..d9f1a032 100644
--- a/exchanges/okgroup/okgroup_wrapper.go
+++ b/exchanges/okgroup/okgroup_wrapper.go
@@ -72,7 +72,7 @@ func (o *OKGroup) Setup(exch *config.ExchangeConfig) error {
 
 // FetchOrderbook returns orderbook base on the currency pair
 func (o *OKGroup) FetchOrderbook(p currency.Pair, assetType asset.Item) (resp orderbook.Base, err error) {
-	ob, err := orderbook.Get(o.GetName(), p, assetType)
+	ob, err := orderbook.Get(o.Name, p, assetType)
 	if err != nil {
 		return o.UpdateOrderbook(p, assetType)
 	}
diff --git a/exchanges/poloniex/poloniex_live_test.go b/exchanges/poloniex/poloniex_live_test.go
index 26d83788..f2ad34f2 100644
--- a/exchanges/poloniex/poloniex_live_test.go
+++ b/exchanges/poloniex/poloniex_live_test.go
@@ -33,6 +33,6 @@ func TestMain(m *testing.M) {
 	if err != nil {
 		log.Fatal("Poloniex setup error", err)
 	}
-	log.Printf(sharedtestvalues.LiveTesting, p.GetName(), p.API.Endpoints.URL)
+	log.Printf(sharedtestvalues.LiveTesting, p.Name, p.API.Endpoints.URL)
 	os.Exit(m.Run())
 }
diff --git a/exchanges/poloniex/poloniex_mock_test.go b/exchanges/poloniex/poloniex_mock_test.go
index 2e7205dc..546ee7d3 100644
--- a/exchanges/poloniex/poloniex_mock_test.go
+++ b/exchanges/poloniex/poloniex_mock_test.go
@@ -46,6 +46,6 @@ func TestMain(m *testing.M) {
 	p.HTTPClient = newClient
 	p.API.Endpoints.URL = serverDetails
 
-	log.Printf(sharedtestvalues.MockTesting, p.GetName(), p.API.Endpoints.URL)
+	log.Printf(sharedtestvalues.MockTesting, p.Name, p.API.Endpoints.URL)
 	os.Exit(m.Run())
 }
diff --git a/exchanges/poloniex/poloniex_websocket.go b/exchanges/poloniex/poloniex_websocket.go
index 4a81a363..62e2186c 100644
--- a/exchanges/poloniex/poloniex_websocket.go
+++ b/exchanges/poloniex/poloniex_websocket.go
@@ -161,7 +161,7 @@ func (p *Poloniex) WsHandleData() {
 								}
 
 								p.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
-									Exchange: p.GetName(),
+									Exchange: p.Name,
 									Asset:    asset.Spot,
 									Pair:     currency.NewPairFromString(currencyPair),
 								}
@@ -176,7 +176,7 @@ func (p *Poloniex) WsHandleData() {
 								}
 
 								p.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
-									Exchange: p.GetName(),
+									Exchange: p.Name,
 									Asset:    asset.Spot,
 									Pair:     currency.NewPairFromString(currencyPair),
 								}
@@ -435,7 +435,7 @@ func (p *Poloniex) WsProcessOrderbookSnapshot(ob []interface{}, symbol string) e
 	newOrderBook.Bids = bids
 	newOrderBook.AssetType = asset.Spot
 	newOrderBook.Pair = currency.NewPairFromString(symbol)
-	newOrderBook.ExchangeName = p.GetName()
+	newOrderBook.ExchangeName = p.Name
 
 	return p.Websocket.Orderbook.LoadSnapshot(&newOrderBook)
 }
diff --git a/exchanges/poloniex/poloniex_wrapper.go b/exchanges/poloniex/poloniex_wrapper.go
index f5844854..9bccee98 100644
--- a/exchanges/poloniex/poloniex_wrapper.go
+++ b/exchanges/poloniex/poloniex_wrapper.go
@@ -183,7 +183,7 @@ func (p *Poloniex) Start(wg *sync.WaitGroup) {
 // Run implements the Poloniex wrapper
 func (p *Poloniex) Run() {
 	if p.Verbose {
-		log.Debugf(log.ExchangeSys, "%s Websocket: %s (url: %s).\n", p.GetName(), common.IsEnabled(p.Websocket.IsEnabled()), poloniexWebsocketAddress)
+		log.Debugf(log.ExchangeSys, "%s Websocket: %s (url: %s).\n", p.Name, common.IsEnabled(p.Websocket.IsEnabled()), poloniexWebsocketAddress)
 		p.PrintEnabledPairs()
 	}
 
@@ -253,7 +253,7 @@ func (p *Poloniex) UpdateTicker(currencyPair currency.Pair, assetType asset.Item
 		tp.Volume = tick[curr].BaseVolume
 		tp.QuoteVolume = tick[curr].QuoteVolume
 
-		err = ticker.ProcessTicker(p.GetName(), &tp, assetType)
+		err = ticker.ProcessTicker(p.Name, &tp, assetType)
 		if err != nil {
 			log.Error(log.Ticker, err)
 		}
@@ -263,7 +263,7 @@ func (p *Poloniex) UpdateTicker(currencyPair currency.Pair, assetType asset.Item
 
 // FetchTicker returns the ticker for a currency pair
 func (p *Poloniex) FetchTicker(currencyPair currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker(p.GetName(), currencyPair, assetType)
+	tickerNew, err := ticker.GetTicker(p.Name, currencyPair, assetType)
 	if err != nil {
 		return p.UpdateTicker(currencyPair, assetType)
 	}
@@ -272,7 +272,7 @@ func (p *Poloniex) FetchTicker(currencyPair currency.Pair, assetType asset.Item)
 
 // FetchOrderbook returns orderbook base on the currency pair
 func (p *Poloniex) FetchOrderbook(currencyPair currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(p.GetName(), currencyPair, assetType)
+	ob, err := orderbook.Get(p.Name, currencyPair, assetType)
 	if err != nil {
 		return p.UpdateOrderbook(currencyPair, assetType)
 	}
@@ -311,7 +311,7 @@ func (p *Poloniex) UpdateOrderbook(currencyPair currency.Pair, assetType asset.I
 
 		orderBook.Pair = x
 		orderBook.Asks = obItems
-		orderBook.ExchangeName = p.GetName()
+		orderBook.ExchangeName = p.Name
 		orderBook.AssetType = assetType
 
 		err = orderBook.Process()
@@ -326,7 +326,7 @@ func (p *Poloniex) UpdateOrderbook(currencyPair currency.Pair, assetType asset.I
 // Poloniex exchange
 func (p *Poloniex) GetAccountInfo() (exchange.AccountInfo, error) {
 	var response exchange.AccountInfo
-	response.Exchange = p.GetName()
+	response.Exchange = p.Name
 	accountBalance, err := p.GetBalances()
 	if err != nil {
 		return response, err
diff --git a/exchanges/yobit/yobit_wrapper.go b/exchanges/yobit/yobit_wrapper.go
index b2d36ae0..bd7ed666 100644
--- a/exchanges/yobit/yobit_wrapper.go
+++ b/exchanges/yobit/yobit_wrapper.go
@@ -212,7 +212,7 @@ func (y *Yobit) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Pric
 
 // FetchTicker returns the ticker for a currency pair
 func (y *Yobit) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tick, err := ticker.GetTicker(y.GetName(), p, assetType)
+	tick, err := ticker.GetTicker(y.Name, p, assetType)
 	if err != nil {
 		return y.UpdateTicker(p, assetType)
 	}
@@ -221,7 +221,7 @@ func (y *Yobit) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price
 
 // FetchOrderbook returns the orderbook for a currency pair
 func (y *Yobit) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(y.GetName(), p, assetType)
+	ob, err := orderbook.Get(y.Name, p, assetType)
 	if err != nil {
 		return y.UpdateOrderbook(p, assetType)
 	}
@@ -253,7 +253,7 @@ func (y *Yobit) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderboo
 	}
 
 	orderBook.Pair = p
-	orderBook.ExchangeName = y.GetName()
+	orderBook.ExchangeName = y.Name
 	orderBook.AssetType = assetType
 
 	err = orderBook.Process()
@@ -268,7 +268,7 @@ func (y *Yobit) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderboo
 // Yobit exchange
 func (y *Yobit) GetAccountInfo() (exchange.AccountInfo, error) {
 	var response exchange.AccountInfo
-	response.Exchange = y.GetName()
+	response.Exchange = y.Name
 	accountBalance, err := y.GetAccountInformation()
 	if err != nil {
 		return response, err
diff --git a/exchanges/zb/zb_websocket.go b/exchanges/zb/zb_websocket.go
index f85cfd9c..0ac7d39d 100644
--- a/exchanges/zb/zb_websocket.go
+++ b/exchanges/zb/zb_websocket.go
@@ -140,7 +140,7 @@ func (z *ZB) WsHandleData() {
 				newOrderBook.Bids = bids
 				newOrderBook.AssetType = asset.Spot
 				newOrderBook.Pair = cPair
-				newOrderBook.ExchangeName = z.GetName()
+				newOrderBook.ExchangeName = z.Name
 
 				err = z.Websocket.Orderbook.LoadSnapshot(&newOrderBook)
 				if err != nil {
@@ -151,7 +151,7 @@ func (z *ZB) WsHandleData() {
 				z.Websocket.DataHandler <- wshandler.WebsocketOrderbookUpdate{
 					Pair:     cPair,
 					Asset:    asset.Spot,
-					Exchange: z.GetName(),
+					Exchange: z.Name,
 				}
 
 			case strings.Contains(result.Channel, "trades"):
@@ -173,7 +173,7 @@ func (z *ZB) WsHandleData() {
 					Timestamp:    time.Unix(0, t.Date*int64(time.Millisecond)),
 					CurrencyPair: cPair,
 					AssetType:    asset.Spot,
-					Exchange:     z.GetName(),
+					Exchange:     z.Name,
 					EventTime:    t.Date,
 					Price:        t.Price,
 					Amount:       t.Amount,
diff --git a/exchanges/zb/zb_wrapper.go b/exchanges/zb/zb_wrapper.go
index 4ca4efd7..60108f15 100644
--- a/exchanges/zb/zb_wrapper.go
+++ b/exchanges/zb/zb_wrapper.go
@@ -249,7 +249,7 @@ func (z *ZB) UpdateTicker(p currency.Pair, assetType asset.Item) (ticker.Price,
 
 // FetchTicker returns the ticker for a currency pair
 func (z *ZB) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, error) {
-	tickerNew, err := ticker.GetTicker(z.GetName(), p, assetType)
+	tickerNew, err := ticker.GetTicker(z.Name, p, assetType)
 	if err != nil {
 		return z.UpdateTicker(p, assetType)
 	}
@@ -258,7 +258,7 @@ func (z *ZB) FetchTicker(p currency.Pair, assetType asset.Item) (ticker.Price, e
 
 // FetchOrderbook returns orderbook base on the currency pair
 func (z *ZB) FetchOrderbook(p currency.Pair, assetType asset.Item) (orderbook.Base, error) {
-	ob, err := orderbook.Get(z.GetName(), p, assetType)
+	ob, err := orderbook.Get(z.Name, p, assetType)
 	if err != nil {
 		return z.UpdateOrderbook(p, assetType)
 	}
@@ -289,7 +289,7 @@ func (z *ZB) UpdateOrderbook(p currency.Pair, assetType asset.Item) (orderbook.B
 
 	orderBook.Pair = p
 	orderBook.AssetType = assetType
-	orderBook.ExchangeName = z.GetName()
+	orderBook.ExchangeName = z.Name
 
 	err = orderBook.Process()
 	if err != nil {
@@ -327,7 +327,7 @@ func (z *ZB) GetAccountInfo() (exchange.AccountInfo, error) {
 		})
 	}
 
-	info.Exchange = z.GetName()
+	info.Exchange = z.Name
 	info.Accounts = append(info.Accounts, exchange.Account{
 		Currencies: balances,
 	})