Renaming repo

46 files changed, 122 insertions, 122 deletions

diff --git a/api4/api.go b/api4/api.go
index ef96ec589..5204c0596 100644
--- a/api4/api.go
+++ b/api4/api.go
@@ -8,10 +8,10 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 
 	_ "github.com/nicksnyder/go-i18n/i18n"
 )
diff --git a/api4/apitestlib.go b/api4/apitestlib.go
index 35ac1e1ec..e647d659c 100644
--- a/api4/apitestlib.go
+++ b/api4/apitestlib.go
@@ -17,13 +17,13 @@ import (
 	"time"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
-	"github.com/mattermost/platform/wsapi"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/utils"
+	"github.com/mattermost/mattermost-server/wsapi"
 
-	"github.com/mattermost/platform/jobs"
+	"github.com/mattermost/mattermost-server/jobs"
 	s3 "github.com/minio/minio-go"
 	"github.com/minio/minio-go/pkg/credentials"
 )
diff --git a/api4/brand.go b/api4/brand.go
index de81b8a3b..bc1ddd2cc 100644
--- a/api4/brand.go
+++ b/api4/brand.go
@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitBrand() {
diff --git a/api4/channel.go b/api4/channel.go
index 98cbc4eff..8f3f46b8c 100644
--- a/api4/channel.go
+++ b/api4/channel.go
@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitChannel() {
diff --git a/api4/channel_test.go b/api4/channel_test.go
index 4a200571f..57b760178 100644
--- a/api4/channel_test.go
+++ b/api4/channel_test.go
@@ -11,9 +11,9 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreateChannel(t *testing.T) {
diff --git a/api4/cluster.go b/api4/cluster.go
index 54ff15cf1..0b119ad1a 100644
--- a/api4/cluster.go
+++ b/api4/cluster.go
@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitCluster() {
diff --git a/api4/command.go b/api4/command.go
index ebcc34a72..ba15b0ff3 100644
--- a/api4/command.go
+++ b/api4/command.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitCommand() {
diff --git a/api4/command_help_test.go b/api4/command_help_test.go
index 5178370e5..2328d8ef2 100644
--- a/api4/command_help_test.go
+++ b/api4/command_help_test.go
@@ -6,8 +6,8 @@ package api4
 import (
 	"testing"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestHelpCommand(t *testing.T) {
diff --git a/api4/command_test.go b/api4/command_test.go
index 71db0456a..7f61fddad 100644
--- a/api4/command_test.go
+++ b/api4/command_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreateCommand(t *testing.T) {
diff --git a/api4/compliance.go b/api4/compliance.go
index 45f6460c8..fe93834e3 100644
--- a/api4/compliance.go
+++ b/api4/compliance.go
@@ -8,9 +8,9 @@ import (
 	"strconv"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 	"github.com/mssola/user_agent"
 )
 
diff --git a/api4/context.go b/api4/context.go
index f8768b11e..04eb9bbc3 100644
--- a/api4/context.go
+++ b/api4/context.go
@@ -13,10 +13,10 @@ import (
 	l4g "github.com/alecthomas/log4go"
 	goi18n "github.com/nicksnyder/go-i18n/i18n"
 
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 type Context struct {
diff --git a/api4/elasticsearch.go b/api4/elasticsearch.go
index c8af8089b..c4d059af9 100644
--- a/api4/elasticsearch.go
+++ b/api4/elasticsearch.go
@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitElasticsearch() {
diff --git a/api4/emoji.go b/api4/emoji.go
index 35aea5b0d..80c73c9e6 100644
--- a/api4/emoji.go
+++ b/api4/emoji.go
@@ -9,10 +9,10 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/einterfaces"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/einterfaces"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitEmoji() {
diff --git a/api4/emoji_test.go b/api4/emoji_test.go
index 067e9964e..1aad6d2ec 100644
--- a/api4/emoji_test.go
+++ b/api4/emoji_test.go
@@ -9,8 +9,8 @@ import (
 	_ "image/gif"
 	"testing"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreateEmoji(t *testing.T) {
diff --git a/api4/file.go b/api4/file.go
index b1a77b567..a0562a0c2 100644
--- a/api4/file.go
+++ b/api4/file.go
@@ -10,9 +10,9 @@ import (
 	"strings"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const (
diff --git a/api4/file_test.go b/api4/file_test.go
index f08597047..95acb114c 100644
--- a/api4/file_test.go
+++ b/api4/file_test.go
@@ -10,10 +10,10 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestUploadFile(t *testing.T) {
diff --git a/api4/job.go b/api4/job.go
index 9c4b64ab1..42cbdd3f7 100644
--- a/api4/job.go
+++ b/api4/job.go
@@ -7,8 +7,8 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func InitJob() {
diff --git a/api4/job_test.go b/api4/job_test.go
index 50ce0bef6..9ccde42dc 100644
--- a/api4/job_test.go
+++ b/api4/job_test.go
@@ -7,8 +7,8 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
 )
 
 func TestCreateJob(t *testing.T) {
diff --git a/api4/ldap.go b/api4/ldap.go
index eac5778b6..84c0eff28 100644
--- a/api4/ldap.go
+++ b/api4/ldap.go
@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitLdap() {
diff --git a/api4/oauth.go b/api4/oauth.go
index 7cb741cdb..593d405db 100644
--- a/api4/oauth.go
+++ b/api4/oauth.go
@@ -9,9 +9,9 @@ import (
 	"strings"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitOAuth() {
diff --git a/api4/oauth_test.go b/api4/oauth_test.go
index ceb44a44e..d25e4f934 100644
--- a/api4/oauth_test.go
+++ b/api4/oauth_test.go
@@ -9,8 +9,8 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreateOAuthApp(t *testing.T) {
diff --git a/api4/openGraph.go b/api4/openGraph.go
index e9e998474..690631ab0 100644
--- a/api4/openGraph.go
+++ b/api4/openGraph.go
@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const OPEN_GRAPH_METADATA_CACHE_SIZE = 10000
diff --git a/api4/openGraph_test.go b/api4/openGraph_test.go
index df1af66fc..5c4332745 100644
--- a/api4/openGraph_test.go
+++ b/api4/openGraph_test.go
@@ -11,7 +11,7 @@ import (
 
 	"testing"
 
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestGetOpenGraphMetadata(t *testing.T) {
diff --git a/api4/plugin.go b/api4/plugin.go
index 7c7b595ed..5b030e71d 100644
--- a/api4/plugin.go
+++ b/api4/plugin.go
@@ -9,9 +9,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const (
diff --git a/api4/plugin_test.go b/api4/plugin_test.go
index caaeeef6b..3d8b065b9 100644
--- a/api4/plugin_test.go
+++ b/api4/plugin_test.go
@@ -9,7 +9,7 @@ import (
 	"os"
 	"testing"
 
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/api4/post.go b/api4/post.go
index eaa910502..1b60d0b4a 100644
--- a/api4/post.go
+++ b/api4/post.go
@@ -8,9 +8,9 @@ import (
 	"strconv"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitPost() {
diff --git a/api4/post_test.go b/api4/post_test.go
index 36ebf26ab..cce75e39b 100644
--- a/api4/post_test.go
+++ b/api4/post_test.go
@@ -14,9 +14,9 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreatePost(t *testing.T) {
diff --git a/api4/preference.go b/api4/preference.go
index 355c06ec5..41c200bd0 100644
--- a/api4/preference.go
+++ b/api4/preference.go
@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitPreference() {
diff --git a/api4/preference_test.go b/api4/preference_test.go
index ecf3acbd7..7eded5035 100644
--- a/api4/preference_test.go
+++ b/api4/preference_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestGetPreferences(t *testing.T) {
diff --git a/api4/reaction.go b/api4/reaction.go
index 41f794639..aca6fc3ec 100644
--- a/api4/reaction.go
+++ b/api4/reaction.go
@@ -7,9 +7,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitReaction() {
diff --git a/api4/reaction_test.go b/api4/reaction_test.go
index ca8335206..75f0cded0 100644
--- a/api4/reaction_test.go
+++ b/api4/reaction_test.go
@@ -9,7 +9,7 @@ import (
 
 	"reflect"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestSaveReaction(t *testing.T) {
diff --git a/api4/saml.go b/api4/saml.go
index b8167b505..d16bef787 100644
--- a/api4/saml.go
+++ b/api4/saml.go
@@ -8,9 +8,9 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitSaml() {
diff --git a/api4/status.go b/api4/status.go
index a62aa6654..a17707127 100644
--- a/api4/status.go
+++ b/api4/status.go
@@ -8,9 +8,9 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitStatus() {
diff --git a/api4/status_test.go b/api4/status_test.go
index cfc9a0786..7cb4fb821 100644
--- a/api4/status_test.go
+++ b/api4/status_test.go
@@ -3,7 +3,7 @@ package api4
 import (
 	"testing"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestGetUserStatus(t *testing.T) {
diff --git a/api4/system.go b/api4/system.go
index f92dd22f8..fbfbd0ef2 100644
--- a/api4/system.go
+++ b/api4/system.go
@@ -11,9 +11,9 @@ import (
 	"strconv"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitSystem() {
diff --git a/api4/system_test.go b/api4/system_test.go
index 0d8b3cec8..c960f8689 100644
--- a/api4/system_test.go
+++ b/api4/system_test.go
@@ -6,9 +6,9 @@ import (
 	"testing"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestGetPing(t *testing.T) {
diff --git a/api4/team.go b/api4/team.go
index 5b0054bb8..d15db6bd4 100644
--- a/api4/team.go
+++ b/api4/team.go
@@ -10,9 +10,9 @@ import (
 	"strconv"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 const (
diff --git a/api4/team_test.go b/api4/team_test.go
index 22fbb8a6f..35589f4e8 100644
--- a/api4/team_test.go
+++ b/api4/team_test.go
@@ -14,8 +14,8 @@ import (
 
 	"encoding/base64"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreateTeam(t *testing.T) {
diff --git a/api4/user.go b/api4/user.go
index ec9663208..b0d9ac699 100644
--- a/api4/user.go
+++ b/api4/user.go
@@ -10,10 +10,10 @@ import (
 	"time"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/store"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/store"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitUser() {
diff --git a/api4/user_test.go b/api4/user_test.go
index d6ba25268..1b9553d2d 100644
--- a/api4/user_test.go
+++ b/api4/user_test.go
@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
diff --git a/api4/webhook.go b/api4/webhook.go
index b98e054df..c86fa3253 100644
--- a/api4/webhook.go
+++ b/api4/webhook.go
@@ -10,9 +10,9 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/mux"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitWebhook() {
diff --git a/api4/webhook_test.go b/api4/webhook_test.go
index 28b98bf42..aa263d47f 100644
--- a/api4/webhook_test.go
+++ b/api4/webhook_test.go
@@ -8,8 +8,8 @@ import (
 	"net/http"
 	"testing"
 
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestCreateIncomingWebhook(t *testing.T) {
diff --git a/api4/webrtc.go b/api4/webrtc.go
index 81a1599b2..a9f80fb7b 100644
--- a/api4/webrtc.go
+++ b/api4/webrtc.go
@@ -7,8 +7,8 @@ import (
 	"net/http"
 
 	l4g "github.com/alecthomas/log4go"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitWebrtc() {
diff --git a/api4/webrtc_test.go b/api4/webrtc_test.go
index 44dbcdf2e..18a1d0959 100644
--- a/api4/webrtc_test.go
+++ b/api4/webrtc_test.go
@@ -6,7 +6,7 @@ package api4
 import (
 	"testing"
 
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func TestGetWebrtcToken(t *testing.T) {
diff --git a/api4/websocket.go b/api4/websocket.go
index 08bb2e709..fbc1ea9cc 100644
--- a/api4/websocket.go
+++ b/api4/websocket.go
@@ -8,9 +8,9 @@ import (
 
 	l4g "github.com/alecthomas/log4go"
 	"github.com/gorilla/websocket"
-	"github.com/mattermost/platform/app"
-	"github.com/mattermost/platform/model"
-	"github.com/mattermost/platform/utils"
+	"github.com/mattermost/mattermost-server/app"
+	"github.com/mattermost/mattermost-server/model"
+	"github.com/mattermost/mattermost-server/utils"
 )
 
 func InitWebSocket() {
diff --git a/api4/websocket_test.go b/api4/websocket_test.go
index 5266e30a2..f07e09b55 100644
--- a/api4/websocket_test.go
+++ b/api4/websocket_test.go
@@ -7,7 +7,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/mattermost/platform/model"
+	"github.com/mattermost/mattermost-server/model"
 )
 
 func TestWebSocket(t *testing.T) {