diff --git a/.gitignore b/.gitignore
index daf913b1..66f8fb50 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,24 +1,2 @@
-# Compiled Object files, Static and Dynamic libs (Shared Objects)
-*.o
-*.a
-*.so
-
-# Folders
-_obj
-_test
-
-# Architecture specific extensions/prefixes
-*.[568vq]
-[568vq].out
-
-*.cgo1.go
-*.cgo2.c
-_cgo_defun.c
-_cgo_gotypes.go
-_cgo_export.*
-
-_testmain.go
-
-*.exe
-*.test
-*.prof
+.idea/
+.vscode/
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index fadc3264..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-language: go
-go:
- - 1.8
-install:
- - go get github.com/golang/lint/golint
- - go get github.com/fzipp/gocyclo
- - go get github.com/client9/misspell/...
- - go get github.com/gordonklaus/ineffassign
-script: ./hooks/pre-commit
diff --git a/client.go b/client.go
index 08061385..ca70c1e8 100644
--- a/client.go
+++ b/client.go
@@ -1,7 +1,7 @@
-// Package gomatrix implements the Matrix Client-Server API.
+// Package mautrix implements the Matrix Client-Server API.
 //
-// Specification can be found at http://matrix.org/docs/spec/client_server/r0.2.0.html
-package gomatrix
+// Specification can be found at http://matrix.org/docs/spec/client_server/r0.4.0.html
+package mautrix
 
 import (
 	"bytes"
diff --git a/events.go b/events.go
index a66aea68..50f2781c 100644
--- a/events.go
+++ b/events.go
@@ -1,4 +1,5 @@
-package gomatrix
+// Copyright 2018 Tulir Asokan
+package mautrix
 
 import (
 	"encoding/json"
diff --git a/filter.go b/filter.go
index 2a0c37fa..41cab2d7 100644
--- a/filter.go
+++ b/filter.go
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package gomatrix
+package mautrix
 
 import "errors"
 
diff --git a/format/htmlparser.go b/format/htmlparser.go
index 85f41056..b681be61 100644
--- a/format/htmlparser.go
+++ b/format/htmlparser.go
@@ -1,3 +1,4 @@
+// Copyright 2018 Tulir Asokan
 package format
 
 import (
diff --git a/format/markdown.go b/format/markdown.go
index 3bfa1dcf..65abf569 100644
--- a/format/markdown.go
+++ b/format/markdown.go
@@ -1,12 +1,13 @@
+// Copyright 2018 Tulir Asokan
 package format
 
 import (
 	"gopkg.in/russross/blackfriday.v2"
-	"maunium.net/go/gomatrix"
+	"maunium.net/go/mautrix"
 	"strings"
 )
 
-func RenderMarkdown(text string) gomatrix.Content {
+func RenderMarkdown(text string) mautrix.Content {
 	parser := blackfriday.New(
 		blackfriday.WithExtensions(blackfriday.NoIntraEmphasis |
 			blackfriday.Tables |
@@ -28,10 +29,10 @@ func RenderMarkdown(text string) gomatrix.Content {
 	renderer.RenderFooter(&buf, ast)
 	htmlBody := buf.String()
 
-	return gomatrix.Content{
+	return mautrix.Content{
 		FormattedBody: htmlBody,
-		Format:        gomatrix.FormatHTML,
-		MsgType:       gomatrix.MsgText,
+		Format:        mautrix.FormatHTML,
+		MsgType:       mautrix.MsgText,
 		Body:          HTMLToText(htmlBody),
 	}
 }
diff --git a/reply.go b/reply.go
index 69854217..5e3af92a 100644
--- a/reply.go
+++ b/reply.go
@@ -1,4 +1,5 @@
-package gomatrix
+// Copyright 2018 Tulir Asokan
+package mautrix
 
 import (
 	"fmt"
diff --git a/requests.go b/requests.go
index 81ff361c..b90e6fb9 100644
--- a/requests.go
+++ b/requests.go
@@ -1,4 +1,4 @@
-package gomatrix
+package mautrix
 
 // ReqRegister is the JSON request for http://matrix.org/docs/spec/client_server/r0.2.0.html#post-matrix-client-r0-register
 type ReqRegister struct {
diff --git a/responses.go b/responses.go
index c5f6eebf..2adf90af 100644
--- a/responses.go
+++ b/responses.go
@@ -1,4 +1,4 @@
-package gomatrix
+package mautrix
 
 // RespError is the standard JSON error response from Homeservers. It also implements the Golang "error" interface.
 // See http://matrix.org/docs/spec/client_server/r0.2.0.html#api-standards
diff --git a/room.go b/room.go
index 80a91d83..086e2592 100644
--- a/room.go
+++ b/room.go
@@ -1,4 +1,4 @@
-package gomatrix
+package mautrix
 
 // Room represents a single Matrix room.
 type Room struct {
diff --git a/store.go b/store.go
index 6dc687e5..774398e2 100644
--- a/store.go
+++ b/store.go
@@ -1,4 +1,4 @@
-package gomatrix
+package mautrix
 
 // Storer is an interface which must be satisfied to store client data.
 //
diff --git a/sync.go b/sync.go
index 09170d7e..9589edc6 100644
--- a/sync.go
+++ b/sync.go
@@ -1,4 +1,4 @@
-package gomatrix
+package mautrix
 
 import (
 	"encoding/json"
diff --git a/userids.go b/userids.go
index 70002c5b..ce6e02d4 100644
--- a/userids.go
+++ b/userids.go
@@ -1,4 +1,4 @@
-package gomatrix
+package mautrix
 
 import (
 	"bytes"
diff --git a/userids_test.go b/userids_test.go
index b896740d..c3eb5da9 100644
--- a/userids_test.go
+++ b/userids_test.go
@@ -1,4 +1,4 @@
-package gomatrix
+package mautrix
 
 import (
 	"testing"