diff --git a/consul/discovery.go b/consul/discovery.go
index 2f60d24..d7a39a3 100644
--- a/consul/discovery.go
+++ b/consul/discovery.go
@@ -5,7 +5,6 @@ import (
 	"log"
 	"net/http"
 	"strconv"
-	"strings"
 	"time"
 
 	consul "github.com/hashicorp/consul/api"
@@ -14,8 +13,8 @@ import (
 type Service struct {
 	AppID       string
 	Name        string
+	Domain      string
 	Address     string
-	IP          string
 	Port        int
 	TTL         time.Duration
 	ConsulAgent *consul.Agent
@@ -23,12 +22,12 @@ type Service struct {
 
 var ErrServiceUnavailable = fmt.Errorf("Service is unavailable")
 
-func NewService(servAddr, id, appName, ip, domain string, appPort int) (*Service, error) {
+func NewService(servAddr, id, name, hostname, domain string, appPort int) (*Service, error) {
 	s := new(Service)
 	s.AppID = id
-	s.Name = strings.Replace(appName, "-", "", -1)
-	s.Address = domain
-	s.IP = ip
+	s.Name = name
+	s.Address = hostname
+	s.Domain = domain
 	s.Port = appPort
 	s.TTL = time.Second * 15
 
@@ -58,14 +57,14 @@ func (s *Service) GetID() string {
 }
 
 func (s *Service) GetFullAddr() string {
-	return fmt.Sprintf("http://%s:%d/", s.IP, s.Port)
+	return fmt.Sprintf("http://%s:%d/", s.Address, s.Port)
 }
 
 func (s *Service) Register() error {
 	def := &consul.AgentServiceRegistration{
 		ID:      s.GetID(),
 		Name:    s.Name,
-		Address: s.IP,
+		Address: s.Address,
 		Port:    s.Port,
 		Tags:    s.getTags(),
 		Meta:    s.getMetadata(),
@@ -146,7 +145,7 @@ func (s *Service) getTags() []string {
 
 	tags := []string{
 		"traefik.enable=true",
-		"traefik.http.routers." + s.Name + ".rule=Host(`" + s.Address + "`)",
+		"traefik.http.routers." + s.Name + ".rule=Host(`" + s.Domain + "`)",
 		"traefik.http.routers." + s.Name + ".entryPoints=https",
 		"traefik.http.routers." + s.Name + ".tls=true",
 		"traefik.http.routers." + s.Name + ".service=" + s.Name,