diff --git a/.circleci/config.yml b/.circleci/config.yml
index bf8d9288..c8f64282 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -35,8 +35,8 @@ jobs:
       - checkout
 
       - run: go get -t -d -v ./...
-      - run: go get -u github.com/go-xorm/core
-      - run: go get -u github.com/go-xorm/builder
+      - run: go get -u xorm.io/core
+      - run: go get -u xorm.io/builder
       - run: GO111MODULE=off go build -v
       - run: GO111MODULE=on go build -v
 
diff --git a/.drone.yml b/.drone.yml
index 0a79ed02..df9d405b 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -59,8 +59,8 @@ pipeline:
     image: golang:${GO_VERSION}
     commands:
       - go get -t -d -v ./...
-      - go get -u github.com/go-xorm/core
-      - go get -u github.com/go-xorm/builder
+      - go get -u xorm.io/core
+      - go get -u xorm.io/builder
       - go build -v
     when:
       event: [ push, pull_request ]
diff --git a/README.md b/README.md
index f6121609..2b839d52 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,7 @@ Xorm is a simple and powerful ORM for Go.
 
 * Optimistic Locking support
 
-* SQL Builder support via [github.com/go-xorm/builder](https://github.com/go-xorm/builder)
+* SQL Builder support via [xorm.io/builder](https://xorm.io/builder)
 
 * Automatical Read/Write seperatelly
 
diff --git a/README_CN.md b/README_CN.md
index 35b58c0c..0cec6ed5 100644
--- a/README_CN.md
+++ b/README_CN.md
@@ -362,7 +362,7 @@ if _, err := session.Exec("delete from userinfo where username = ?", user2.Usern
 return session.Commit()
 ```
 
-* 事物的简写方法
+* 事务的简写方法
 
 ```Go
 res, err := engine.Transaction(func(session *xorm.Session) (interface{}, error) {
diff --git a/cache_lru.go b/cache_lru.go
index c9672ceb..ab948bd2 100644
--- a/cache_lru.go
+++ b/cache_lru.go
@@ -10,7 +10,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // LRUCacher implments cache object facilities
diff --git a/cache_lru_test.go b/cache_lru_test.go
index 28854474..7da36f00 100644
--- a/cache_lru_test.go
+++ b/cache_lru_test.go
@@ -7,7 +7,7 @@ package xorm
 import (
 	"testing"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/cache_memory_store.go b/cache_memory_store.go
index 36853b19..0c483f45 100644
--- a/cache_memory_store.go
+++ b/cache_memory_store.go
@@ -7,7 +7,7 @@ package xorm
 import (
 	"sync"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 var _ core.CacheStore = NewMemoryStore()
diff --git a/dialect_mssql.go b/dialect_mssql.go
index ea543825..3330212c 100644
--- a/dialect_mssql.go
+++ b/dialect_mssql.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 var (
diff --git a/dialect_mssql_test.go b/dialect_mssql_test.go
index f0673016..acd1d059 100644
--- a/dialect_mssql_test.go
+++ b/dialect_mssql_test.go
@@ -8,7 +8,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 func TestParseMSSQL(t *testing.T) {
diff --git a/dialect_mysql.go b/dialect_mysql.go
index 31240c71..2628042a 100644
--- a/dialect_mysql.go
+++ b/dialect_mysql.go
@@ -13,7 +13,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 var (
diff --git a/dialect_oracle.go b/dialect_oracle.go
index ac0081b3..b66145bc 100644
--- a/dialect_oracle.go
+++ b/dialect_oracle.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 var (
diff --git a/dialect_postgres.go b/dialect_postgres.go
index d6f40368..662f6401 100644
--- a/dialect_postgres.go
+++ b/dialect_postgres.go
@@ -11,7 +11,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // from http://www.postgresql.org/docs/current/static/sql-keywords-appendix.html
diff --git a/dialect_postgres_test.go b/dialect_postgres_test.go
index 06c79ca4..ebc079e1 100644
--- a/dialect_postgres_test.go
+++ b/dialect_postgres_test.go
@@ -4,7 +4,7 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/jackc/pgx/stdlib"
 	"github.com/stretchr/testify/assert"
 )
diff --git a/dialect_sqlite3.go b/dialect_sqlite3.go
index e1294814..e30a7751 100644
--- a/dialect_sqlite3.go
+++ b/dialect_sqlite3.go
@@ -11,7 +11,7 @@ import (
 	"regexp"
 	"strings"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 var (
diff --git a/engine.go b/engine.go
index 2a54a622..0c794512 100644
--- a/engine.go
+++ b/engine.go
@@ -20,8 +20,8 @@ import (
 	"sync"
 	"time"
 
-	"github.com/go-xorm/builder"
-	"github.com/go-xorm/core"
+	"xorm.io/builder"
+	"xorm.io/core"
 )
 
 // Engine is the major struct of xorm, it means a database manager.
@@ -125,6 +125,7 @@ func (engine *Engine) Logger() core.ILogger {
 // SetLogger set the new logger
 func (engine *Engine) SetLogger(logger core.ILogger) {
 	engine.logger = logger
+	engine.showSQL = logger.IsShowSQL()
 	engine.dialect.SetLogger(logger)
 }
 
@@ -1363,31 +1364,31 @@ func (engine *Engine) DropIndexes(bean interface{}) error {
 }
 
 // Exec raw sql
-func (engine *Engine) Exec(sqlorArgs ...interface{}) (sql.Result, error) {
+func (engine *Engine) Exec(sqlOrArgs ...interface{}) (sql.Result, error) {
 	session := engine.NewSession()
 	defer session.Close()
-	return session.Exec(sqlorArgs...)
+	return session.Exec(sqlOrArgs...)
 }
 
 // Query a raw sql and return records as []map[string][]byte
-func (engine *Engine) Query(sqlorArgs ...interface{}) (resultsSlice []map[string][]byte, err error) {
+func (engine *Engine) Query(sqlOrArgs ...interface{}) (resultsSlice []map[string][]byte, err error) {
 	session := engine.NewSession()
 	defer session.Close()
-	return session.Query(sqlorArgs...)
+	return session.Query(sqlOrArgs...)
 }
 
 // QueryString runs a raw sql and return records as []map[string]string
-func (engine *Engine) QueryString(sqlorArgs ...interface{}) ([]map[string]string, error) {
+func (engine *Engine) QueryString(sqlOrArgs ...interface{}) ([]map[string]string, error) {
 	session := engine.NewSession()
 	defer session.Close()
-	return session.QueryString(sqlorArgs...)
+	return session.QueryString(sqlOrArgs...)
 }
 
 // QueryInterface runs a raw sql and return records as []map[string]interface{}
-func (engine *Engine) QueryInterface(sqlorArgs ...interface{}) ([]map[string]interface{}, error) {
+func (engine *Engine) QueryInterface(sqlOrArgs ...interface{}) ([]map[string]interface{}, error) {
 	session := engine.NewSession()
 	defer session.Close()
-	return session.QueryInterface(sqlorArgs...)
+	return session.QueryInterface(sqlOrArgs...)
 }
 
 // Insert one or more records
diff --git a/engine_cond.go b/engine_cond.go
index 67d050f6..702ac804 100644
--- a/engine_cond.go
+++ b/engine_cond.go
@@ -11,8 +11,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-xorm/builder"
-	"github.com/go-xorm/core"
+	"xorm.io/builder"
+	"xorm.io/core"
 )
 
 func (engine *Engine) buildConds(table *core.Table, bean interface{},
diff --git a/engine_group.go b/engine_group.go
index 6ef68f9c..42d49eca 100644
--- a/engine_group.go
+++ b/engine_group.go
@@ -8,7 +8,7 @@ import (
 	"context"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // EngineGroup defines an engine group
diff --git a/engine_table.go b/engine_table.go
index 4b672a6f..eb5aa850 100644
--- a/engine_table.go
+++ b/engine_table.go
@@ -9,7 +9,7 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // tbNameWithSchema will automatically add schema prefix on table name
diff --git a/go.mod b/go.mod
index dbe1cce8..9a30b4b4 100644
--- a/go.mod
+++ b/go.mod
@@ -6,9 +6,6 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/denisenkom/go-mssqldb v0.0.0-20190121005146-b04fd42d9952
 	github.com/go-sql-driver/mysql v1.4.1
-	github.com/go-xorm/builder v0.3.3
-	github.com/go-xorm/core v0.6.2
-	github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a // indirect
 	github.com/google/go-cmp v0.2.0 // indirect
 	github.com/jackc/fake v0.0.0-20150926172116-812a484cc733 // indirect
 	github.com/jackc/pgx v3.3.0+incompatible
@@ -22,4 +19,6 @@ require (
 	github.com/ziutek/mymysql v1.5.4
 	golang.org/x/crypto v0.0.0-20190122013713-64072686203f // indirect
 	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+	xorm.io/builder v0.3.5
+	xorm.io/core v0.6.3
 )
diff --git a/go.sum b/go.sum
index 755e32b8..307d46d9 100644
--- a/go.sum
+++ b/go.sum
@@ -10,10 +10,6 @@ github.com/denisenkom/go-mssqldb v0.0.0-20190121005146-b04fd42d9952 h1:b5OnbZD49
 github.com/denisenkom/go-mssqldb v0.0.0-20190121005146-b04fd42d9952/go.mod h1:xN/JuLBIz4bjkxNmByTiV1IbhfnYb6oo99phBn4Eqhc=
 github.com/go-sql-driver/mysql v1.4.1 h1:g24URVg0OFbNUTx9qqY1IRZ9D9z3iPyi5zKhQZpNwpA=
 github.com/go-sql-driver/mysql v1.4.1/go.mod h1:zAC/RDZ24gD3HViQzih4MyKcchzm+sOG5ZlKdlhCg5w=
-github.com/go-xorm/builder v0.3.3 h1:v8grgrwOGv/iHXIEhIvOwHZIPLrpxRKSX8yWSMLFn/4=
-github.com/go-xorm/builder v0.3.3/go.mod h1:v8mE3MFBgtL+RGFNfUnAMUqqfk/Y4W5KuwCFQIEpQLk=
-github.com/go-xorm/core v0.6.2 h1:EJLcSxf336POJr670wKB55Mah9f93xzvGYzNRgnT8/Y=
-github.com/go-xorm/core v0.6.2/go.mod h1:bwPIfLdm/FzWgVUH8WPVlr+uJhscvNGFcaZKXsI3n2c=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a h1:9wScpmSP5A3Bk8V3XHWUcJmYTh+ZnlHVyc+A4oZYS3Y=
 github.com/go-xorm/sqlfiddle v0.0.0-20180821085327-62ce714f951a/go.mod h1:56xuuqnHyryaerycW3BfssRdxQstACi0Epw/yC5E2xM=
 github.com/golang/protobuf v1.2.0/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
@@ -53,3 +49,9 @@ google.golang.org/appengine v1.4.0 h1:/wp5JvzpHIxhs/dumFmF7BXTf3Z+dd4uXta4kVyO50
 google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
 gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+xorm.io/builder v0.3.5 h1:EilU39fvWDxjb1cDaELpYhsF+zziRBhew8xk4pngO+A=
+xorm.io/builder v0.3.5/go.mod h1:ZFbByS/KxZI1FKRjL05PyJ4YrK2bcxlUaAxdum5aTR8=
+xorm.io/core v0.6.2 h1:EJLcSxf336POJr670wKB55Mah9f93xzvGYzNRgnT8/Y=
+xorm.io/core v0.6.2/go.mod h1:bwPIfLdm/FzWgVUH8WPVlr+uJhscvNGFcaZKXsI3n2c=
+xorm.io/core v0.6.3 h1:n1NhVZt1s2oLw1BZfX2ocIJsHyso259uPgg63BGr37M=
+xorm.io/core v0.6.3/go.mod h1:8kz/C6arVW/O9vk3PgCiMJO2hIAm1UcuOL3dSPyZ2qo=
diff --git a/helpers.go b/helpers.go
index f1705782..db8fc581 100644
--- a/helpers.go
+++ b/helpers.go
@@ -12,7 +12,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // str2PK convert string value to primary key value according to tp
diff --git a/interface.go b/interface.go
index 4f084421..0928f66a 100644
--- a/interface.go
+++ b/interface.go
@@ -10,7 +10,7 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // Interface defines the interface which Engine, EngineGroup and Session will implementate.
@@ -28,7 +28,7 @@ type Interface interface {
 	Delete(interface{}) (int64, error)
 	Distinct(columns ...string) *Session
 	DropIndexes(bean interface{}) error
-	Exec(sqlOrAgrs ...interface{}) (sql.Result, error)
+	Exec(sqlOrArgs ...interface{}) (sql.Result, error)
 	Exist(bean ...interface{}) (bool, error)
 	Find(interface{}, ...interface{}) error
 	FindAndCount(interface{}, ...interface{}) (int64, error)
@@ -50,9 +50,9 @@ type Interface interface {
 	Omit(columns ...string) *Session
 	OrderBy(order string) *Session
 	Ping() error
-	Query(sqlOrAgrs ...interface{}) (resultsSlice []map[string][]byte, err error)
-	QueryInterface(sqlorArgs ...interface{}) ([]map[string]interface{}, error)
-	QueryString(sqlorArgs ...interface{}) ([]map[string]string, error)
+	Query(sqlOrArgs ...interface{}) (resultsSlice []map[string][]byte, err error)
+	QueryInterface(sqlOrArgs ...interface{}) ([]map[string]interface{}, error)
+	QueryString(sqlOrArgs ...interface{}) ([]map[string]string, error)
 	Rows(bean interface{}) (*Rows, error)
 	SetExpr(string, string) *Session
 	SQL(interface{}, ...interface{}) *Session
diff --git a/logger.go b/logger.go
index 727d030a..7b26e77f 100644
--- a/logger.go
+++ b/logger.go
@@ -9,7 +9,7 @@ import (
 	"io"
 	"log"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // default log options
diff --git a/rows.go b/rows.go
index ab5607e5..bdd44589 100644
--- a/rows.go
+++ b/rows.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // Rows rows wrapper a rows to
@@ -113,17 +113,9 @@ func (rows *Rows) Close() error {
 		defer rows.session.Close()
 	}
 
-	if rows.lastError == nil {
-		if rows.rows != nil {
-			rows.lastError = rows.rows.Close()
-			if rows.lastError != nil {
-				return rows.lastError
-			}
-		}
-	} else {
-		if rows.rows != nil {
-			defer rows.rows.Close()
-		}
+	if rows.rows != nil {
+		return rows.rows.Close()
 	}
+
 	return rows.lastError
 }
diff --git a/rows_test.go b/rows_test.go
index c5b44279..af333861 100644
--- a/rows_test.go
+++ b/rows_test.go
@@ -38,6 +38,22 @@ func TestRows(t *testing.T) {
 		cnt++
 	}
 	assert.EqualValues(t, 1, cnt)
+	assert.False(t, rows.Next())
+	assert.NoError(t, rows.Close())
+
+	rows0, err := testEngine.Where("1>1").Rows(new(UserRows))
+	assert.NoError(t, err)
+	defer rows0.Close()
+
+	cnt = 0
+	user0 := new(UserRows)
+	for rows0.Next() {
+		err = rows0.Scan(user0)
+		assert.NoError(t, err)
+		cnt++
+	}
+	assert.EqualValues(t, 0, cnt)
+	assert.NoError(t, rows0.Close())
 
 	sess := testEngine.NewSession()
 	defer sess.Close()
diff --git a/session.go b/session.go
index fdb58c58..b33955fd 100644
--- a/session.go
+++ b/session.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 type sessionType int
diff --git a/session_cols.go b/session_cols.go
index 47d109c6..dc3befcf 100644
--- a/session_cols.go
+++ b/session_cols.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 type incrParam struct {
diff --git a/session_cols_test.go b/session_cols_test.go
index 3315e6b5..5f5954c7 100644
--- a/session_cols_test.go
+++ b/session_cols_test.go
@@ -7,7 +7,7 @@ package xorm
 import (
 	"testing"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/session_cond.go b/session_cond.go
index e1d528f2..b16bdea8 100644
--- a/session_cond.go
+++ b/session_cond.go
@@ -4,7 +4,7 @@
 
 package xorm
 
-import "github.com/go-xorm/builder"
+import "xorm.io/builder"
 
 // Sql provides raw sql input parameter. When you have a complex SQL statement
 // and cannot use Where, Id, In and etc. Methods to describe, you can use SQL.
diff --git a/session_cond_test.go b/session_cond_test.go
index ae4c2f82..10650484 100644
--- a/session_cond_test.go
+++ b/session_cond_test.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/go-xorm/builder"
+	"xorm.io/builder"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/session_convert.go b/session_convert.go
index 6b6fbdea..c13b003d 100644
--- a/session_convert.go
+++ b/session_convert.go
@@ -14,7 +14,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 func (session *Session) str2Time(col *core.Column, data string) (outTime time.Time, outErr error) {
diff --git a/session_delete.go b/session_delete.go
index 26782f69..675d4d8c 100644
--- a/session_delete.go
+++ b/session_delete.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"strconv"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 func (session *Session) cacheDelete(table *core.Table, tableName, sqlStr string, args ...interface{}) error {
diff --git a/session_delete_test.go b/session_delete_test.go
index 66032afe..5edb0718 100644
--- a/session_delete_test.go
+++ b/session_delete_test.go
@@ -8,7 +8,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/session_exist.go b/session_exist.go
index 6aa154aa..660cc47e 100644
--- a/session_exist.go
+++ b/session_exist.go
@@ -9,8 +9,8 @@ import (
 	"fmt"
 	"reflect"
 
-	"github.com/go-xorm/builder"
-	"github.com/go-xorm/core"
+	"xorm.io/builder"
+	"xorm.io/core"
 )
 
 // Exist returns true if the record exist otherwise return false
@@ -34,6 +34,8 @@ func (session *Session) Exist(bean ...interface{}) (bool, error) {
 				return false, ErrTableNotFound
 			}
 
+			tableName = session.statement.Engine.Quote(tableName)
+
 			if session.statement.cond.IsValid() {
 				condSQL, condArgs, err := builder.ToSQL(session.statement.cond)
 				if err != nil {
diff --git a/session_find.go b/session_find.go
index 48ee3209..d3fc0d30 100644
--- a/session_find.go
+++ b/session_find.go
@@ -10,8 +10,8 @@ import (
 	"reflect"
 	"strings"
 
-	"github.com/go-xorm/builder"
-	"github.com/go-xorm/core"
+	"xorm.io/builder"
+	"xorm.io/core"
 )
 
 const (
diff --git a/session_find_test.go b/session_find_test.go
index f9ebdc91..f805f06e 100644
--- a/session_find_test.go
+++ b/session_find_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/session_get.go b/session_get.go
index 5ecf2f37..a38707c8 100644
--- a/session_get.go
+++ b/session_get.go
@@ -11,7 +11,7 @@ import (
 	"reflect"
 	"strconv"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // Get retrieve one record from database, bean's non-empty fields
diff --git a/session_get_test.go b/session_get_test.go
index 025a747a..7bb84a8b 100644
--- a/session_get_test.go
+++ b/session_get_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/session_insert.go b/session_insert.go
index aa2a432b..3cff48f6 100644
--- a/session_insert.go
+++ b/session_insert.go
@@ -12,7 +12,7 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // Insert insert one or more beans
diff --git a/session_pk_test.go b/session_pk_test.go
index da4209b5..4c066634 100644
--- a/session_pk_test.go
+++ b/session_pk_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/session_query.go b/session_query.go
index 6d597cc4..21c00b8d 100644
--- a/session_query.go
+++ b/session_query.go
@@ -11,13 +11,13 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-xorm/builder"
-	"github.com/go-xorm/core"
+	"xorm.io/builder"
+	"xorm.io/core"
 )
 
-func (session *Session) genQuerySQL(sqlorArgs ...interface{}) (string, []interface{}, error) {
-	if len(sqlorArgs) > 0 {
-		return convertSQLOrArgs(sqlorArgs...)
+func (session *Session) genQuerySQL(sqlOrArgs ...interface{}) (string, []interface{}, error) {
+	if len(sqlOrArgs) > 0 {
+		return convertSQLOrArgs(sqlOrArgs...)
 	}
 
 	if session.statement.RawSQL != "" {
@@ -78,12 +78,12 @@ func (session *Session) genQuerySQL(sqlorArgs ...interface{}) (string, []interfa
 }
 
 // Query runs a raw sql and return records as []map[string][]byte
-func (session *Session) Query(sqlorArgs ...interface{}) ([]map[string][]byte, error) {
+func (session *Session) Query(sqlOrArgs ...interface{}) ([]map[string][]byte, error) {
 	if session.isAutoClose {
 		defer session.Close()
 	}
 
-	sqlStr, args, err := session.genQuerySQL(sqlorArgs...)
+	sqlStr, args, err := session.genQuerySQL(sqlOrArgs...)
 	if err != nil {
 		return nil, err
 	}
@@ -227,12 +227,12 @@ func rows2SliceString(rows *core.Rows) (resultsSlice [][]string, err error) {
 }
 
 // QueryString runs a raw sql and return records as []map[string]string
-func (session *Session) QueryString(sqlorArgs ...interface{}) ([]map[string]string, error) {
+func (session *Session) QueryString(sqlOrArgs ...interface{}) ([]map[string]string, error) {
 	if session.isAutoClose {
 		defer session.Close()
 	}
 
-	sqlStr, args, err := session.genQuerySQL(sqlorArgs...)
+	sqlStr, args, err := session.genQuerySQL(sqlOrArgs...)
 	if err != nil {
 		return nil, err
 	}
@@ -247,12 +247,12 @@ func (session *Session) QueryString(sqlorArgs ...interface{}) ([]map[string]stri
 }
 
 // QuerySliceString runs a raw sql and return records as [][]string
-func (session *Session) QuerySliceString(sqlorArgs ...interface{}) ([][]string, error) {
+func (session *Session) QuerySliceString(sqlOrArgs ...interface{}) ([][]string, error) {
 	if session.isAutoClose {
 		defer session.Close()
 	}
 
-	sqlStr, args, err := session.genQuerySQL(sqlorArgs...)
+	sqlStr, args, err := session.genQuerySQL(sqlOrArgs...)
 	if err != nil {
 		return nil, err
 	}
@@ -300,12 +300,12 @@ func rows2Interfaces(rows *core.Rows) (resultsSlice []map[string]interface{}, er
 }
 
 // QueryInterface runs a raw sql and return records as []map[string]interface{}
-func (session *Session) QueryInterface(sqlorArgs ...interface{}) ([]map[string]interface{}, error) {
+func (session *Session) QueryInterface(sqlOrArgs ...interface{}) ([]map[string]interface{}, error) {
 	if session.isAutoClose {
 		defer session.Close()
 	}
 
-	sqlStr, args, err := session.genQuerySQL(sqlorArgs...)
+	sqlStr, args, err := session.genQuerySQL(sqlOrArgs...)
 	if err != nil {
 		return nil, err
 	}
diff --git a/session_query_test.go b/session_query_test.go
index 233929af..772206a8 100644
--- a/session_query_test.go
+++ b/session_query_test.go
@@ -10,8 +10,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-xorm/builder"
-	"github.com/go-xorm/core"
+	"xorm.io/builder"
+	"xorm.io/core"
 
 	"github.com/stretchr/testify/assert"
 )
diff --git a/session_raw.go b/session_raw.go
index c2556365..67648ef1 100644
--- a/session_raw.go
+++ b/session_raw.go
@@ -9,8 +9,8 @@ import (
 	"reflect"
 	"time"
 
-	"github.com/go-xorm/builder"
-	"github.com/go-xorm/core"
+	"xorm.io/builder"
+	"xorm.io/core"
 )
 
 func (session *Session) queryPreprocess(sqlStr *string, paramStr ...interface{}) {
@@ -194,14 +194,14 @@ func (session *Session) exec(sqlStr string, args ...interface{}) (sql.Result, er
 	return session.DB().ExecContext(session.ctx, sqlStr, args...)
 }
 
-func convertSQLOrArgs(sqlorArgs ...interface{}) (string, []interface{}, error) {
-	switch sqlorArgs[0].(type) {
+func convertSQLOrArgs(sqlOrArgs ...interface{}) (string, []interface{}, error) {
+	switch sqlOrArgs[0].(type) {
 	case string:
-		return sqlorArgs[0].(string), sqlorArgs[1:], nil
+		return sqlOrArgs[0].(string), sqlOrArgs[1:], nil
 	case *builder.Builder:
-		return sqlorArgs[0].(*builder.Builder).ToSQL()
+		return sqlOrArgs[0].(*builder.Builder).ToSQL()
 	case builder.Builder:
-		bd := sqlorArgs[0].(builder.Builder)
+		bd := sqlOrArgs[0].(builder.Builder)
 		return bd.ToSQL()
 	}
 
@@ -209,16 +209,16 @@ func convertSQLOrArgs(sqlorArgs ...interface{}) (string, []interface{}, error) {
 }
 
 // Exec raw sql
-func (session *Session) Exec(sqlorArgs ...interface{}) (sql.Result, error) {
+func (session *Session) Exec(sqlOrArgs ...interface{}) (sql.Result, error) {
 	if session.isAutoClose {
 		defer session.Close()
 	}
 
-	if len(sqlorArgs) == 0 {
+	if len(sqlOrArgs) == 0 {
 		return nil, ErrUnSupportedType
 	}
 
-	sqlStr, args, err := convertSQLOrArgs(sqlorArgs...)
+	sqlStr, args, err := convertSQLOrArgs(sqlOrArgs...)
 	if err != nil {
 		return nil, err
 	}
diff --git a/session_schema.go b/session_schema.go
index 7629906f..da5c8855 100644
--- a/session_schema.go
+++ b/session_schema.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"strings"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 // Ping test if database is ok
diff --git a/session_stats_test.go b/session_stats_test.go
index 61839576..01c76ba5 100644
--- a/session_stats_test.go
+++ b/session_stats_test.go
@@ -9,7 +9,7 @@ import (
 	"strconv"
 	"testing"
 
-	"github.com/go-xorm/builder"
+	"xorm.io/builder"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/session_tx_test.go b/session_tx_test.go
index ab66713e..23e1bf28 100644
--- a/session_tx_test.go
+++ b/session_tx_test.go
@@ -9,7 +9,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/session_update.go b/session_update.go
index 1c20556c..216c4e87 100644
--- a/session_update.go
+++ b/session_update.go
@@ -11,8 +11,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/go-xorm/builder"
-	"github.com/go-xorm/core"
+	"xorm.io/builder"
+	"xorm.io/core"
 )
 
 func (session *Session) cacheUpdate(table *core.Table, tableName, sqlStr string, args ...interface{}) error {
diff --git a/session_update_test.go b/session_update_test.go
index 3dab8a12..415c699f 100644
--- a/session_update_test.go
+++ b/session_update_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/statement.go b/statement.go
index ddff4493..88b84235 100644
--- a/statement.go
+++ b/statement.go
@@ -12,8 +12,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-xorm/builder"
-	"github.com/go-xorm/core"
+	"xorm.io/builder"
+	"xorm.io/core"
 )
 
 // Statement save all the sql info for executing SQL
diff --git a/statement_test.go b/statement_test.go
index acca72da..a5324233 100644
--- a/statement_test.go
+++ b/statement_test.go
@@ -9,7 +9,7 @@ import (
 	"strings"
 	"testing"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/syslogger.go b/syslogger.go
index 8840635d..11ba01e7 100644
--- a/syslogger.go
+++ b/syslogger.go
@@ -10,7 +10,7 @@ import (
 	"fmt"
 	"log/syslog"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 var _ core.ILogger = &SyslogLogger{}
diff --git a/tag.go b/tag.go
index 8e1ab117..6feb581a 100644
--- a/tag.go
+++ b/tag.go
@@ -11,7 +11,7 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 type tagContext struct {
diff --git a/tag_extends_test.go b/tag_extends_test.go
index 72205e68..5a8031f0 100644
--- a/tag_extends_test.go
+++ b/tag_extends_test.go
@@ -10,7 +10,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/tag_id_test.go b/tag_id_test.go
index a53fe6bd..f1c5a6bc 100644
--- a/tag_id_test.go
+++ b/tag_id_test.go
@@ -7,7 +7,7 @@ package xorm
 import (
 	"testing"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/tag_test.go b/tag_test.go
index a1df6356..8dc7fa13 100644
--- a/tag_test.go
+++ b/tag_test.go
@@ -11,7 +11,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/types.go b/types.go
index 25c007d7..c76a5460 100644
--- a/types.go
+++ b/types.go
@@ -7,7 +7,7 @@ package xorm
 import (
 	"reflect"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 var (
diff --git a/types_test.go b/types_test.go
index f1894fdf..274609b2 100644
--- a/types_test.go
+++ b/types_test.go
@@ -9,7 +9,7 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	"github.com/stretchr/testify/assert"
 )
 
diff --git a/xorm.go b/xorm.go
index 157c9d34..26d00d26 100644
--- a/xorm.go
+++ b/xorm.go
@@ -15,7 +15,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 )
 
 const (
diff --git a/xorm_test.go b/xorm_test.go
index a35f0743..c0302df3 100644
--- a/xorm_test.go
+++ b/xorm_test.go
@@ -15,7 +15,7 @@ import (
 
 	_ "github.com/denisenkom/go-mssqldb"
 	_ "github.com/go-sql-driver/mysql"
-	"github.com/go-xorm/core"
+	"xorm.io/core"
 	_ "github.com/lib/pq"
 	_ "github.com/mattn/go-sqlite3"
 	_ "github.com/ziutek/mymysql/godrv"