diff --git a/sql/0001_initial.up.sql b/sql/0001_initial.up.sql
index a3299eb..bc2ab51 100644
--- a/sql/0001_initial.up.sql
+++ b/sql/0001_initial.up.sql
@@ -24,7 +24,7 @@ CREATE TRIGGER update_users_updated_at BEFORE UPDATE ON users FOR EACH ROW EXECU
 CREATE TABLE tokens  (
     id uuid PRIMARY KEY DEFAULT gen_random_uuid(),
     value text NOT NULL UNIQUE,
-    users_id uuid REFERENCES users (id) ON DELETE CASCADE,
+    user_id uuid REFERENCES users (id) ON DELETE CASCADE,
 LIKE base INCLUDING DEFAULTS
 );
 CREATE TRIGGER update_tokens_updated_at BEFORE UPDATE ON tokens FOR EACH ROW EXECUTE PROCEDURE  update_modified_column();
diff --git a/users/users.go b/users/users.go
index b23b292..eba6842 100644
--- a/users/users.go
+++ b/users/users.go
@@ -14,10 +14,10 @@ const (
 	updateUserQuery = `UPDATE users SET name=:name, hash=:hash RETURNING *;`
 	deleteUseQuery  = `DELETE FROM users WHERE id=:id;`
 
-	addTokenQuery    = `INSERT INTO tokens (value, users_id) VALUES ($1, $2) RETURNING id;`
-	getTokensQuery   = `SELECT id, value FROM tokens WHERE users_id=$1;`
-	checkTokenQuery  = `SELECT count(*) FROM tokens WHERE users_id=$1 AND value=$2;`
-	deleteTokenQuery = `DELETE FROM tokens WHERE users_id=$1 AND value=$2;`
+	addTokenQuery    = `INSERT INTO tokens (value, user_id) VALUES ($1, $2) RETURNING id;`
+	getTokensQuery   = `SELECT id, value FROM tokens WHERE user_id=$1;`
+	checkTokenQuery  = `SELECT count(*) FROM tokens WHERE user_id=$1 AND value=$2;`
+	deleteTokenQuery = `DELETE FROM tokens WHERE user_id=$1 AND value=$2;`
 )
 
 // User represents an user
diff --git a/users/users_test.go b/users/users_test.go
index 8b3ab08..1416348 100644
--- a/users/users_test.go
+++ b/users/users_test.go
@@ -142,7 +142,7 @@ func TestTokenAddDelete(t *testing.T) {
 
 		// Remove user and test auto delete token
 		u.Delete(db)
-		q := `SELECT count(*) FROM tokens WHERE users_id=$1;`
+		q := `SELECT count(*) FROM tokens WHERE user_id=$1;`
 		var count int
 		err = db.QueryRowx(q, u.ID).Scan(&count)
 		if err != nil {