diff --git a/clients/mqtt_client.go b/clients/mqtt_client.go
index 76513e2e..c762185d 100644
--- a/clients/mqtt_client.go
+++ b/clients/mqtt_client.go
@@ -7,7 +7,7 @@ import (
 	"log"
 	"encoding/json"
 
-	"github.com/mainflux/mainflux-lite/db"
+	"github.com/mainflux/mainflux/db"
 
 	"github.com/krylovsk/gosenml"
 	"github.com/kataras/iris"
diff --git a/config/config.go b/config/config.go
index 39c2fc75..78263e0f 100644
--- a/config/config.go
+++ b/config/config.go
@@ -45,7 +45,7 @@ func (this *Config) Parse() {
 		viper.SetConfigFile(os.Args[1])
 	} else {
 		// default cfg path to source dir, as we keep cfg.yml there
-		cfgDir := os.Getenv("GOPATH") + "/src/github.com/mainflux/mainflux-lite/config"
+		cfgDir := os.Getenv("GOPATH") + "/src/github.com/mainflux/mainflux/config"
 		viper.SetConfigName("config") // name of config file (without extension)
 		viper.AddConfigPath(cfgDir)   // path to look for the config file in
 	}
diff --git a/controllers/channels.go b/controllers/channels.go
index 0df17cde..1ecddd7c 100644
--- a/controllers/channels.go
+++ b/controllers/channels.go
@@ -14,9 +14,9 @@ import (
 	"log"
 	"time"
 
-	"github.com/mainflux/mainflux-lite/db"
-	"github.com/mainflux/mainflux-lite/models"
-	"github.com/mainflux/mainflux-lite/clients"
+	"github.com/mainflux/mainflux/db"
+	"github.com/mainflux/mainflux/models"
+	"github.com/mainflux/mainflux/clients"
 
 	"github.com/satori/go.uuid"
 	"gopkg.in/mgo.v2/bson"
@@ -47,7 +47,6 @@ func CreateChannel(ctx *iris.Context) {
 	Db.Init()
 	defer Db.Close()
 
-
 	c := models.Channel{}
 	json.Unmarshal(ctx.RequestCtx.Request.Body(), &c)
 
@@ -58,8 +57,9 @@ func CreateChannel(ctx *iris.Context) {
 	c.Id = uuid.String()
 
 	// Insert reference to DeviceId
-	if c.Device = nil {
+	if c.Device == "" {
 		ctx.JSON(iris.StatusBadRequest, iris.Map{"response": "No device ID in request body"})
+		return
 	}
 
 	// TODO Check if Device ID is valid (in database)
diff --git a/controllers/devices.go b/controllers/devices.go
index 3ee70aed..1528bc3c 100644
--- a/controllers/devices.go
+++ b/controllers/devices.go
@@ -14,8 +14,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/mainflux/mainflux-lite/db"
-	"github.com/mainflux/mainflux-lite/models"
+	"github.com/mainflux/mainflux/db"
+	"github.com/mainflux/mainflux/models"
 
 	"github.com/satori/go.uuid"
 	"gopkg.in/mgo.v2/bson"
diff --git a/main.go b/main.go
index 2c55210a..b860ec47 100644
--- a/main.go
+++ b/main.go
@@ -13,10 +13,10 @@ import (
 	"os"
 	"strings"
 	"strconv"
-	"github.com/mainflux/mainflux-lite/config"
-	"github.com/mainflux/mainflux-lite/db"
-	"github.com/mainflux/mainflux-lite/servers"
-	"github.com/mainflux/mainflux-lite/clients"
+	"github.com/mainflux/mainflux/config"
+	"github.com/mainflux/mainflux/db"
+	"github.com/mainflux/mainflux/servers"
+	"github.com/mainflux/mainflux/clients"
 	"github.com/fatih/color"
 	"runtime"
 	"flag"
diff --git a/servers/http_server.go b/servers/http_server.go
index 456f45a0..a56a28aa 100644
--- a/servers/http_server.go
+++ b/servers/http_server.go
@@ -11,8 +11,8 @@ package servers
 import (
 	"strconv"
 
-	"github.com/mainflux/mainflux-lite/controllers"
-	"github.com/mainflux/mainflux-lite/config"
+	"github.com/mainflux/mainflux/controllers"
+	"github.com/mainflux/mainflux/config"
 
 	"github.com/iris-contrib/middleware/logger"
 	"github.com/kataras/iris"
diff --git a/servers/http_server_test.go b/servers/http_server_test.go
index dede605e..1446999d 100644
--- a/servers/http_server_test.go
+++ b/servers/http_server_test.go
@@ -15,8 +15,8 @@ import (
 	"log"
 	"os"
 
-	"github.com/mainflux/mainflux-lite/config"
-	mfdb "github.com/mainflux/mainflux-lite/db"
+	"github.com/mainflux/mainflux/config"
+	mfdb "github.com/mainflux/mainflux/db"
 
 	"github.com/kataras/iris"
 	"github.com/ory-am/dockertest"