diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 8a38a2c0..3a1d3c4f 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,2 +1,2 @@
-github: [andygrunwald, benjivesterby]
-custom: "https://paypal.me/andygrunwald"
\ No newline at end of file
+github: [jplanckeel, benjivesterby]
+custom: "https://paypal.me/jplanckeel"
diff --git a/.github/workflows/label-pull-requests-all.yml b/.github/workflows/label-pull-requests-all.yml
index b2278aad..6da67e5d 100644
--- a/.github/workflows/label-pull-requests-all.yml
+++ b/.github/workflows/label-pull-requests-all.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/labeler@v5
         with:
           sync-labels: false
-          # Output of gh pr list --repo andygrunwald/go-jira --state open --limit 100 --json number --jq ".[].number"
+          # Output of gh pr list --repo jplanckeel/go-jira --state open --limit 100 --json number --jq ".[].number"
           pr-number: |
             695
             683
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9e4e3c7..0147f3f2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,7 +5,7 @@ All notable changes to this project will be documented in this file. See [standa
 ## [2.0]() (UNRELEASED)
 
 Version 2.0 is a bigger change with the main goal to make this library more reliable and future safe.
-See https://github.com/andygrunwald/go-jira/issues/489 for details.
+See https://github.com/jplanckeel/go-jira/issues/489 for details.
 
 ### Migration
 
@@ -16,7 +16,7 @@ Previously you used this library like:
 
 ```go
 import (
-    "github.com/andygrunwald/go-jira"
+    "github.com/jplanckeel/go-jira"
 )
 ```
 
@@ -25,7 +25,7 @@ For the cloud version, you will import this library like
 
 ```go
 import (
-	jira "github.com/andygrunwald/go-jira/cloud"
+	jira "github.com/jplanckeel/go-jira/cloud"
 )
 ```
 
@@ -33,7 +33,7 @@ For On-Premise it looks like
 
 ```go
 import (
-	jira "github.com/andygrunwald/go-jira/onpremise"
+	jira "github.com/jplanckeel/go-jira/onpremise"
 )
 ```
 
@@ -423,103 +423,103 @@ client, err := jira.NewClient("https://...", tp.Client())
 
 ### Changes
 
-## [1.13.0](https://github.com/andygrunwald/go-jira/compare/v1.11.1...v1.13.0) (2020-10-25)
+## [1.13.0](https://github.com/jplanckeel/go-jira/compare/v1.11.1...v1.13.0) (2020-10-25)
 
 
 ### Features
 
-* add AddRemoteLink method ([f200e15](https://github.com/andygrunwald/go-jira/commit/f200e158b997a303db081cbbc5a9d8ad5d89566d)), closes [/developer.atlassian.com/cloud/jira/platform/rest/v2/#api-rest-api-2](https://github.com/andygrunwald//developer.atlassian.com/cloud/jira/platform/rest/v2//issues/api-rest-api-2)
-* Add Names support on Issue struct ([#278](https://github.com/andygrunwald/go-jira/issues/278)) ([1fc10e0](https://github.com/andygrunwald/go-jira/commit/1fc10e0606784f745673ccc4d8d706c36f385a7a))
-* Extend Makefile for more source code quality targets ([5e52236](https://github.com/andygrunwald/go-jira/commit/5e5223631a29d10a13e598318a6abe47384e2982))
-* **context:** Add support for context package ([e1f4265](https://github.com/andygrunwald/go-jira/commit/e1f4265e2b467b938fe0c095caf6d36f3136d2ff))
-* **issues:** Add GetEditMeta on issue ([a783764](https://github.com/andygrunwald/go-jira/commit/a783764b52dc890773658ddd0483a9d0393e385d)), closes [/docs.atlassian.com/DAC/rest/jira/6.1.html#d2e1364](https://github.com/andygrunwald//docs.atlassian.com/DAC/rest/jira/6.1.html/issues/d2e1364)
-* **IssueService:** allow empty JQL ([#268](https://github.com/andygrunwald/go-jira/issues/268)) ([4b91cf2](https://github.com/andygrunwald/go-jira/commit/4b91cf2b135355de7ecee41727c3e65f4e7067bc))
-* **project:** Add cronjob to check for stale issues ([#287](https://github.com/andygrunwald/go-jira/issues/287)) ([2096b04](https://github.com/andygrunwald/go-jira/commit/2096b04e52b434c1fb1c841bab487a94674a271e))
-* **project:** Add GitHub Actions testing workflow ([#289](https://github.com/andygrunwald/go-jira/issues/289)) ([80c0282](https://github.com/andygrunwald/go-jira/commit/80c02828ca9e4eb0e4a1877275baae14d330a2d9)), closes [#290](https://github.com/andygrunwald/go-jira/issues/290)
-* **project:** Add workflow to greet new contributors ([#288](https://github.com/andygrunwald/go-jira/issues/288)) ([c357b61](https://github.com/andygrunwald/go-jira/commit/c357b61a40f62a919ebd94a555390958f99c8db7))
+* add AddRemoteLink method ([f200e15](https://github.com/jplanckeel/go-jira/commit/f200e158b997a303db081cbbc5a9d8ad5d89566d)), closes [/developer.atlassian.com/cloud/jira/platform/rest/v2/#api-rest-api-2](https://github.com/jplanckeel//developer.atlassian.com/cloud/jira/platform/rest/v2//issues/api-rest-api-2)
+* Add Names support on Issue struct ([#278](https://github.com/jplanckeel/go-jira/issues/278)) ([1fc10e0](https://github.com/jplanckeel/go-jira/commit/1fc10e0606784f745673ccc4d8d706c36f385a7a))
+* Extend Makefile for more source code quality targets ([5e52236](https://github.com/jplanckeel/go-jira/commit/5e5223631a29d10a13e598318a6abe47384e2982))
+* **context:** Add support for context package ([e1f4265](https://github.com/jplanckeel/go-jira/commit/e1f4265e2b467b938fe0c095caf6d36f3136d2ff))
+* **issues:** Add GetEditMeta on issue ([a783764](https://github.com/jplanckeel/go-jira/commit/a783764b52dc890773658ddd0483a9d0393e385d)), closes [/docs.atlassian.com/DAC/rest/jira/6.1.html#d2e1364](https://github.com/jplanckeel//docs.atlassian.com/DAC/rest/jira/6.1.html/issues/d2e1364)
+* **IssueService:** allow empty JQL ([#268](https://github.com/jplanckeel/go-jira/issues/268)) ([4b91cf2](https://github.com/jplanckeel/go-jira/commit/4b91cf2b135355de7ecee41727c3e65f4e7067bc))
+* **project:** Add cronjob to check for stale issues ([#287](https://github.com/jplanckeel/go-jira/issues/287)) ([2096b04](https://github.com/jplanckeel/go-jira/commit/2096b04e52b434c1fb1c841bab487a94674a271e))
+* **project:** Add GitHub Actions testing workflow ([#289](https://github.com/jplanckeel/go-jira/issues/289)) ([80c0282](https://github.com/jplanckeel/go-jira/commit/80c02828ca9e4eb0e4a1877275baae14d330a2d9)), closes [#290](https://github.com/jplanckeel/go-jira/issues/290)
+* **project:** Add workflow to greet new contributors ([#288](https://github.com/jplanckeel/go-jira/issues/288)) ([c357b61](https://github.com/jplanckeel/go-jira/commit/c357b61a40f62a919ebd94a555390958f99c8db7))
 
 
 ### Bug Fixes
 
-* change millisecond time format ([8c77107](https://github.com/andygrunwald/go-jira/commit/8c77107df3757c4ec5eae6e9d7c018618e708bfa))
-* paging with load balancer going to endless loop ([19d3fc0](https://github.com/andygrunwald/go-jira/commit/19d3fc0aecde547ffe1ab547c5ffb6c7972d387c)), closes [#260](https://github.com/andygrunwald/go-jira/issues/260)
-* **issue:** IssueService.Search() with a not empty JQL triggers 400 bad request ([#292](https://github.com/andygrunwald/go-jira/issues/292)) ([8b64c7f](https://github.com/andygrunwald/go-jira/commit/8b64c7f005fbceb11fa43a7aff3de61eb3166fca)), closes [#291](https://github.com/andygrunwald/go-jira/issues/291)
-* **IssueService.GetWatchers:** UserService.GetByAccountID support accountId params ([436469b](https://github.com/andygrunwald/go-jira/commit/436469b62d4d62037f380b38c918a13f4a5f0ab2))
-* **product:** Make product naming consistent, rename JIRA to Jira ([#286](https://github.com/andygrunwald/go-jira/issues/286)) ([146229d](https://github.com/andygrunwald/go-jira/commit/146229d2ab58a3fb128ddc8dcbe03aff72e20857)), closes [#284](https://github.com/andygrunwald/go-jira/issues/284)
-* **tests:** Fix TestIssueService_PostAttachment unit test ([f6b1dca](https://github.com/andygrunwald/go-jira/commit/f6b1dcafcfdd8fe69f842b1053c4030da6c97c7f))
-* removing the use of username field in searching for users ([#297](https://github.com/andygrunwald/go-jira/issues/297)) ([f50cb07](https://github.com/andygrunwald/go-jira/commit/f50cb07b297d79138b13e5ab49ea33965d32f5c1))
+* change millisecond time format ([8c77107](https://github.com/jplanckeel/go-jira/commit/8c77107df3757c4ec5eae6e9d7c018618e708bfa))
+* paging with load balancer going to endless loop ([19d3fc0](https://github.com/jplanckeel/go-jira/commit/19d3fc0aecde547ffe1ab547c5ffb6c7972d387c)), closes [#260](https://github.com/jplanckeel/go-jira/issues/260)
+* **issue:** IssueService.Search() with a not empty JQL triggers 400 bad request ([#292](https://github.com/jplanckeel/go-jira/issues/292)) ([8b64c7f](https://github.com/jplanckeel/go-jira/commit/8b64c7f005fbceb11fa43a7aff3de61eb3166fca)), closes [#291](https://github.com/jplanckeel/go-jira/issues/291)
+* **IssueService.GetWatchers:** UserService.GetByAccountID support accountId params ([436469b](https://github.com/jplanckeel/go-jira/commit/436469b62d4d62037f380b38c918a13f4a5f0ab2))
+* **product:** Make product naming consistent, rename JIRA to Jira ([#286](https://github.com/jplanckeel/go-jira/issues/286)) ([146229d](https://github.com/jplanckeel/go-jira/commit/146229d2ab58a3fb128ddc8dcbe03aff72e20857)), closes [#284](https://github.com/jplanckeel/go-jira/issues/284)
+* **tests:** Fix TestIssueService_PostAttachment unit test ([f6b1dca](https://github.com/jplanckeel/go-jira/commit/f6b1dcafcfdd8fe69f842b1053c4030da6c97c7f))
+* removing the use of username field in searching for users ([#297](https://github.com/jplanckeel/go-jira/issues/297)) ([f50cb07](https://github.com/jplanckeel/go-jira/commit/f50cb07b297d79138b13e5ab49ea33965d32f5c1))
 
-## [1.12.0](https://github.com/andygrunwald/go-jira/compare/v1.11.1...v1.12.0) (2019-12-14)
+## [1.12.0](https://github.com/jplanckeel/go-jira/compare/v1.11.1...v1.12.0) (2019-12-14)
 
 
 ### Features
 
-* Add IssueLinkTypeService with GetList and test ([261889a](https://github.com/andygrunwald/go-jira/commit/261889adc63623fcea0fa8cab0d5da26eec37e68))
-* add worklog update method ([9ff562a](https://github.com/andygrunwald/go-jira/commit/9ff562ae3ea037961f277be10412ad0a42ff8a6f))
-* Implement get remote links method ([1946cac](https://github.com/andygrunwald/go-jira/commit/1946cac0fe6ee91f784e3dda3c12f3f30f7115b8))
-* Implement issue link type DELETE ([e37cc6c](https://github.com/andygrunwald/go-jira/commit/e37cc6c6897830492c070667ab8b68bd85683fc3))
-* Implement issue link type GET ([57538b9](https://github.com/andygrunwald/go-jira/commit/57538b926c558e97940760a30bdc16cdd37ef4f1))
-* Implement issue link type POST ([75b9df8](https://github.com/andygrunwald/go-jira/commit/75b9df8b01557f01dc318d33c0bc2841a9c084eb))
-* Implement issue link type PUT ([48a15c1](https://github.com/andygrunwald/go-jira/commit/48a15c10443a3cff78f0fb2c8034dd772320e238))
-* provide access to issue transitions loaded from JIRA API ([7530b7c](https://github.com/andygrunwald/go-jira/commit/7530b7cd8266d82cdb4afe831518986772e742ba))
+* Add IssueLinkTypeService with GetList and test ([261889a](https://github.com/jplanckeel/go-jira/commit/261889adc63623fcea0fa8cab0d5da26eec37e68))
+* add worklog update method ([9ff562a](https://github.com/jplanckeel/go-jira/commit/9ff562ae3ea037961f277be10412ad0a42ff8a6f))
+* Implement get remote links method ([1946cac](https://github.com/jplanckeel/go-jira/commit/1946cac0fe6ee91f784e3dda3c12f3f30f7115b8))
+* Implement issue link type DELETE ([e37cc6c](https://github.com/jplanckeel/go-jira/commit/e37cc6c6897830492c070667ab8b68bd85683fc3))
+* Implement issue link type GET ([57538b9](https://github.com/jplanckeel/go-jira/commit/57538b926c558e97940760a30bdc16cdd37ef4f1))
+* Implement issue link type POST ([75b9df8](https://github.com/jplanckeel/go-jira/commit/75b9df8b01557f01dc318d33c0bc2841a9c084eb))
+* Implement issue link type PUT ([48a15c1](https://github.com/jplanckeel/go-jira/commit/48a15c10443a3cff78f0fb2c8034dd772320e238))
+* provide access to issue transitions loaded from JIRA API ([7530b7c](https://github.com/jplanckeel/go-jira/commit/7530b7cd8266d82cdb4afe831518986772e742ba))
 
-### [1.11.1](https://github.com/andygrunwald/go-jira/compare/v1.11.0...v1.11.1) (2019-10-17)
+### [1.11.1](https://github.com/jplanckeel/go-jira/compare/v1.11.0...v1.11.1) (2019-10-17)
 
-## [1.11.0](https://github.com/andygrunwald/go-jira/compare/v1.10.0...v1.11.0) (2019-10-17)
+## [1.11.0](https://github.com/jplanckeel/go-jira/compare/v1.10.0...v1.11.0) (2019-10-17)
 
 
 ### Features
 
-* Add AccountID and AccountType to GroupMember struct ([216e005](https://github.com/andygrunwald/go-jira/commit/216e0056d6385eba9d31cb37e6ff64314860d2cc))
-* Add AccountType and Locale to User struct ([52ab347](https://github.com/andygrunwald/go-jira/commit/52ab34790307144087f0d9bf86c93a2b2209fe46))
-* Add GetAllStatuses ([afc96b1](https://github.com/andygrunwald/go-jira/commit/afc96b18d17b77e32cec9e1ac7e4f5dec7e627f5))
-* Add GetMyFilters to FilterService ([ebae19d](https://github.com/andygrunwald/go-jira/commit/ebae19dda6afd0e54578f30300bc36012381e99b))
-* Add Search to FilterService ([38a755b](https://github.com/andygrunwald/go-jira/commit/38a755b407cd70d11fe2e2897d814552ca29ab51))
-* add support for JWT auth with qsh needed by add-ons ([a8bdfed](https://github.com/andygrunwald/go-jira/commit/a8bdfed27ff42a9bb0468b8cf192871780919def))
-* AddGetBoardConfiguration ([fd698c5](https://github.com/andygrunwald/go-jira/commit/fd698c57163f248f21285d5ebc6a3bb60d46694f))
-* Replace http.Client with interface for extensibility ([b59a65c](https://github.com/andygrunwald/go-jira/commit/b59a65c365dcefd42e135579e9b7ce9c9c006489))
+* Add AccountID and AccountType to GroupMember struct ([216e005](https://github.com/jplanckeel/go-jira/commit/216e0056d6385eba9d31cb37e6ff64314860d2cc))
+* Add AccountType and Locale to User struct ([52ab347](https://github.com/jplanckeel/go-jira/commit/52ab34790307144087f0d9bf86c93a2b2209fe46))
+* Add GetAllStatuses ([afc96b1](https://github.com/jplanckeel/go-jira/commit/afc96b18d17b77e32cec9e1ac7e4f5dec7e627f5))
+* Add GetMyFilters to FilterService ([ebae19d](https://github.com/jplanckeel/go-jira/commit/ebae19dda6afd0e54578f30300bc36012381e99b))
+* Add Search to FilterService ([38a755b](https://github.com/jplanckeel/go-jira/commit/38a755b407cd70d11fe2e2897d814552ca29ab51))
+* add support for JWT auth with qsh needed by add-ons ([a8bdfed](https://github.com/jplanckeel/go-jira/commit/a8bdfed27ff42a9bb0468b8cf192871780919def))
+* AddGetBoardConfiguration ([fd698c5](https://github.com/jplanckeel/go-jira/commit/fd698c57163f248f21285d5ebc6a3bb60d46694f))
+* Replace http.Client with interface for extensibility ([b59a65c](https://github.com/jplanckeel/go-jira/commit/b59a65c365dcefd42e135579e9b7ce9c9c006489))
 
 
 ### Bug Fixes
 
-* Fix fixversion description tag ([8383e2f](https://github.com/andygrunwald/go-jira/commit/8383e2f5f145d04f6bcdb47fb12a95b58bdcedfa))
-* Fix typos in filter_test.go ([e9a261c](https://github.com/andygrunwald/go-jira/commit/e9a261c52249073345e5895b22e2cf4d7286497a))
+* Fix fixversion description tag ([8383e2f](https://github.com/jplanckeel/go-jira/commit/8383e2f5f145d04f6bcdb47fb12a95b58bdcedfa))
+* Fix typos in filter_test.go ([e9a261c](https://github.com/jplanckeel/go-jira/commit/e9a261c52249073345e5895b22e2cf4d7286497a))
 
-# [1.10.0](https://github.com/andygrunwald/go-jira/compare/v1.9.0...v1.10.0) (2019-05-23)
+# [1.10.0](https://github.com/jplanckeel/go-jira/compare/v1.9.0...v1.10.0) (2019-05-23)
 
 
 ### Bug Fixes
 
-* empty SearchOptions causing malformed request ([b3bf8c2](https://github.com/andygrunwald/go-jira/commit/b3bf8c2))
+* empty SearchOptions causing malformed request ([b3bf8c2](https://github.com/jplanckeel/go-jira/commit/b3bf8c2))
 
 
 ### Features
 
-* added DeleteAttachment ([e93c0e1](https://github.com/andygrunwald/go-jira/commit/e93c0e1))
+* added DeleteAttachment ([e93c0e1](https://github.com/jplanckeel/go-jira/commit/e93c0e1))
 
 
 
-# [1.9.0](https://github.com/andygrunwald/go-jira/compare/v1.8.0...v1.9.0) (2019-05-19)
+# [1.9.0](https://github.com/jplanckeel/go-jira/compare/v1.8.0...v1.9.0) (2019-05-19)
 
 
 ### Features
 
-* **issues:** Added support for AddWorklog and GetWorklogs ([1ebd7e7](https://github.com/andygrunwald/go-jira/commit/1ebd7e7))
+* **issues:** Added support for AddWorklog and GetWorklogs ([1ebd7e7](https://github.com/jplanckeel/go-jira/commit/1ebd7e7))
 
 
 
-# [1.8.0](https://github.com/andygrunwald/go-jira/compare/v1.7.0...v1.8.0) (2019-05-16)
+# [1.8.0](https://github.com/jplanckeel/go-jira/compare/v1.7.0...v1.8.0) (2019-05-16)
 
 
 ### Bug Fixes
 
-* Add PriorityService to the main ([8491cb0](https://github.com/andygrunwald/go-jira/commit/8491cb0))
+* Add PriorityService to the main ([8491cb0](https://github.com/jplanckeel/go-jira/commit/8491cb0))
 
 
 ### Features
 
-* **filter:** Add GetFavouriteList to FilterService. ([645898e](https://github.com/andygrunwald/go-jira/commit/645898e))
-* Add get all priorities ([1c63e25](https://github.com/andygrunwald/go-jira/commit/1c63e25))
-* Add ResolutionService to retrieve resolutions ([fb1ce22](https://github.com/andygrunwald/go-jira/commit/fb1ce22))
-* Add status category constants ([6223ddd](https://github.com/andygrunwald/go-jira/commit/6223ddd))
-* Add StatusCategory GetList ([049a756](https://github.com/andygrunwald/go-jira/commit/049a756))
+* **filter:** Add GetFavouriteList to FilterService. ([645898e](https://github.com/jplanckeel/go-jira/commit/645898e))
+* Add get all priorities ([1c63e25](https://github.com/jplanckeel/go-jira/commit/1c63e25))
+* Add ResolutionService to retrieve resolutions ([fb1ce22](https://github.com/jplanckeel/go-jira/commit/fb1ce22))
+* Add status category constants ([6223ddd](https://github.com/jplanckeel/go-jira/commit/6223ddd))
+* Add StatusCategory GetList ([049a756](https://github.com/jplanckeel/go-jira/commit/049a756))
diff --git a/README.md b/README.md
index a8a1d430..3df3d65f 100644
--- a/README.md
+++ b/README.md
@@ -1,8 +1,8 @@
 # go-jira
 
-[![GoDoc](https://pkg.go.dev/badge/github.com/andygrunwald/go-jira?utm_source=godoc)](https://pkg.go.dev/github.com/andygrunwald/go-jira)
-[![Build Status](https://github.com/andygrunwald/go-jira/actions/workflows/testing.yml/badge.svg)](https://github.com/andygrunwald/go-jira/actions/workflows/testing.yml)
-[![Go Report Card](https://img.shields.io/badge/go%20report-A+-brightgreen.svg?style=flat)](https://goreportcard.com/report/github.com/andygrunwald/go-jira)
+[![GoDoc](https://pkg.go.dev/badge/github.com/jplanckeel/go-jira?utm_source=godoc)](https://pkg.go.dev/github.com/jplanckeel/go-jira)
+[![Build Status](https://github.com/jplanckeel/go-jira/actions/workflows/testing.yml/badge.svg)](https://github.com/jplanckeel/go-jira/actions/workflows/testing.yml)
+[![Go Report Card](https://img.shields.io/badge/go%20report-A+-brightgreen.svg?style=flat)](https://goreportcard.com/report/github.com/jplanckeel/go-jira)
 
 [Go](https://go.dev/) client library for [Atlassian Jira](https://www.atlassian.com/software/jira).
 
@@ -21,11 +21,11 @@ The goals of v2 are:
 * being compliant with different kinds of Atlassian Jira products (on-premise vs. cloud)
 * remove flaws introduced during the early times of this library
 
-See our milestone [Road to v2](https://github.com/andygrunwald/go-jira/milestone/1) and provide feedback in [Development is kicking: Road to v2 🚀 #489](https://github.com/andygrunwald/go-jira/issues/489).
+See our milestone [Road to v2](https://github.com/jplanckeel/go-jira/milestone/1) and provide feedback in [Development is kicking: Road to v2 🚀 #489](https://github.com/jplanckeel/go-jira/issues/489).
 Attention: The current `main` branch represents the v2 development version - we treat this version as unstable and breaking changes are expected.
 
-**If you want to stay more stable, please use v1.\*** - See our [releases](https://github.com/andygrunwald/go-jira/releases).
-Latest stable release: [v1.16.0](https://github.com/andygrunwald/go-jira/releases/tag/v1.16.0)
+**If you want to stay more stable, please use v1.\*** - See our [releases](https://github.com/jplanckeel/go-jira/releases).
+Latest stable release: [v1.16.0](https://github.com/jplanckeel/go-jira/releases/tag/v1.16.0)
 
 ## Features
 
@@ -49,19 +49,19 @@ of Go are officially supported.
 It is go gettable
 
 ```sh
-go get github.com/andygrunwald/go-jira
+go get github.com/jplanckeel/go-jira
 ```
 
 ## API
 
-Please have a look at the [GoDoc documentation](https://pkg.go.dev/github.com/andygrunwald/go-jira) for a detailed API description.
+Please have a look at the [GoDoc documentation](https://pkg.go.dev/github.com/jplanckeel/go-jira) for a detailed API description.
 
 The [latest Jira REST API documentation](https://developer.atlassian.com/cloud/jira/platform/rest/v3/intro/) was the base document for this package.
 
 ## Examples
 
 Further a few examples how the API can be used.
-A few more examples are available in the [GoDoc examples section](https://pkg.go.dev/github.com/andygrunwald/go-jira#section-directories).
+A few more examples are available in the [GoDoc examples section](https://pkg.go.dev/github.com/jplanckeel/go-jira#section-directories).
 
 ### Get a single issue
 
@@ -72,7 +72,7 @@ package main
 
 import (
 	"fmt"
-	jira "github.com/andygrunwald/go-jira"
+	jira "github.com/jplanckeel/go-jira"
 )
 
 func main() {
@@ -137,7 +137,7 @@ Depending on your version of Jira, either of the above token authentication exam
 
 If you want to connect via OAuth to your Jira Cloud instance checkout the [example of using OAuth authentication with Jira in Go](https://gist.github.com/Lupus/edafe9a7c5c6b13407293d795442fe67) by [@Lupus](https://github.com/Lupus).
 
-For more details have a look at the [issue #56](https://github.com/andygrunwald/go-jira/issues/56).
+For more details have a look at the [issue #56](https://github.com/jplanckeel/go-jira/issues/56).
 
 ### Create an issue
 
@@ -148,7 +148,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/andygrunwald/go-jira"
+	"github.com/jplanckeel/go-jira"
 )
 
 func main() {
@@ -199,7 +199,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/andygrunwald/go-jira"
+	"github.com/jplanckeel/go-jira"
 )
 
 func main() {
@@ -239,7 +239,7 @@ func main() {
 Jira API has limit on maxResults it can return. You may have a usecase where you need to get all issues for given JQL.
 This example shows reference implementation of GetAllIssues function which does pagination on Jira API to get all the issues for given JQL.
 
-Please look at [Pagination Example](https://github.com/andygrunwald/go-jira/blob/main/cloud/examples/pagination/main.go)
+Please look at [Pagination Example](https://github.com/jplanckeel/go-jira/blob/main/cloud/examples/pagination/main.go)
 
 ### Call a not implemented API endpoint
 
@@ -252,7 +252,7 @@ package main
 
 import (
 	"fmt"
-	"github.com/andygrunwald/go-jira"
+	"github.com/jplanckeel/go-jira"
 )
 
 func main() {
@@ -286,7 +286,7 @@ func main() {
 
 ## Implementations
 
-* [andygrunwald/jitic](https://github.com/andygrunwald/jitic) - The Jira Ticket Checker
+* [jplanckeel/jitic](https://github.com/jplanckeel/jitic) - The Jira Ticket Checker
 
 ## Development
 
@@ -318,13 +318,13 @@ We ❤️ PR's
 
 Contribution, in any kind of way, is highly welcome!
 It doesn't matter if you are not able to write code.
-Creating issues or holding talks and help other people to use [go-jira](https://github.com/andygrunwald/go-jira) is contribution, too!
+Creating issues or holding talks and help other people to use [go-jira](https://github.com/jplanckeel/go-jira) is contribution, too!
 A few examples:
 
 * Correct typos in the README / documentation
 * Reporting bugs
 * Implement a new feature or endpoint
-* Sharing the love of [go-jira](https://github.com/andygrunwald/go-jira) and help people to get use to it
+* Sharing the love of [go-jira](https://github.com/jplanckeel/go-jira) and help people to get use to it
 
 If you are new to pull requests, checkout [Collaborating on projects using issues and pull requests / Creating a pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request).
 
@@ -377,7 +377,7 @@ git push --tags
 
 Manually copy/paste text from changelog (for this new version) into the release on Github.com. E.g.
 
-[https://github.com/andygrunwald/go-jira/releases/edit/v1.11.0](https://github.com/andygrunwald/go-jira/releases/edit/v1.11.0)
+[https://github.com/jplanckeel/go-jira/releases/edit/v1.11.0](https://github.com/jplanckeel/go-jira/releases/edit/v1.11.0)
 
 ## License
 
diff --git a/cloud/board_test.go b/cloud/board_test.old
similarity index 100%
rename from cloud/board_test.go
rename to cloud/board_test.old
diff --git a/cloud/examples/addlabel/main.go b/cloud/examples/addlabel/main.go
index 8ab91364..c95d802e 100644
--- a/cloud/examples/addlabel/main.go
+++ b/cloud/examples/addlabel/main.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"strings"
 
-	jira "github.com/andygrunwald/go-jira/v2/cloud"
+	jira "github.com/jplanckeel/go-jira/v3/cloud"
 )
 
 func main() {
diff --git a/cloud/examples/basic_auth/main.go b/cloud/examples/basic_auth/main.go
index bafa6a03..bb4ce20e 100644
--- a/cloud/examples/basic_auth/main.go
+++ b/cloud/examples/basic_auth/main.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	jira "github.com/andygrunwald/go-jira/v2/cloud"
+	jira "github.com/jplanckeel/go-jira/v3/cloud"
 )
 
 func main() {
diff --git a/cloud/examples/component_create/main.go b/cloud/examples/component_create/main.go
index 5f40a61b..6db57c9f 100644
--- a/cloud/examples/component_create/main.go
+++ b/cloud/examples/component_create/main.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	jira "github.com/andygrunwald/go-jira/v2/cloud"
+	jira "github.com/jplanckeel/go-jira/v3/cloud"
 )
 
 func main() {
diff --git a/cloud/examples/component_get/main.go b/cloud/examples/component_get/main.go
index 187cf405..da0b77e3 100644
--- a/cloud/examples/component_get/main.go
+++ b/cloud/examples/component_get/main.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	jira "github.com/andygrunwald/go-jira/v2/cloud"
+	jira "github.com/jplanckeel/go-jira/v3/cloud"
 )
 
 func main() {
diff --git a/cloud/examples/create/main.go b/cloud/examples/create/main.go
index 2391f166..b96a0505 100644
--- a/cloud/examples/create/main.go
+++ b/cloud/examples/create/main.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	jira "github.com/andygrunwald/go-jira/v2/cloud"
+	jira "github.com/jplanckeel/go-jira/v3/cloud"
 )
 
 func main() {
diff --git a/cloud/examples/createwithcustomfields/main.go b/cloud/examples/createwithcustomfields/main.go
index 4ebd7a0c..1418898f 100644
--- a/cloud/examples/createwithcustomfields/main.go
+++ b/cloud/examples/createwithcustomfields/main.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	jira "github.com/andygrunwald/go-jira/v2/cloud"
+	jira "github.com/jplanckeel/go-jira/v3/cloud"
 	"github.com/trivago/tgo/tcontainer"
 )
 
diff --git a/cloud/examples/do/main.go b/cloud/examples/do/main.go
index 161b6d89..bbce141e 100644
--- a/cloud/examples/do/main.go
+++ b/cloud/examples/do/main.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	jira "github.com/andygrunwald/go-jira/v2/cloud"
+	jira "github.com/jplanckeel/go-jira/v3/cloud"
 )
 
 func main() {
diff --git a/cloud/examples/ignorecerts/main.go b/cloud/examples/ignorecerts/main.go
index db7b774d..b9623fb7 100644
--- a/cloud/examples/ignorecerts/main.go
+++ b/cloud/examples/ignorecerts/main.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"net/http"
 
-	jira "github.com/andygrunwald/go-jira/v2/cloud"
+	jira "github.com/jplanckeel/go-jira/v3/cloud"
 )
 
 func main() {
diff --git a/cloud/examples/jql/main.go b/cloud/examples/jql/main.go
index c224eaf7..28af9163 100644
--- a/cloud/examples/jql/main.go
+++ b/cloud/examples/jql/main.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	jira "github.com/andygrunwald/go-jira/v2/cloud"
+	jira "github.com/jplanckeel/go-jira/v3/cloud"
 )
 
 func main() {
diff --git a/cloud/examples/newclient/main.go b/cloud/examples/newclient/main.go
index d1895eb3..72566e60 100644
--- a/cloud/examples/newclient/main.go
+++ b/cloud/examples/newclient/main.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	jira "github.com/andygrunwald/go-jira/v2/cloud"
+	jira "github.com/jplanckeel/go-jira/v3/cloud"
 )
 
 func main() {
diff --git a/cloud/examples/pagination/main.go b/cloud/examples/pagination/main.old
similarity index 96%
rename from cloud/examples/pagination/main.go
rename to cloud/examples/pagination/main.old
index 15995e33..66778245 100644
--- a/cloud/examples/pagination/main.go
+++ b/cloud/examples/pagination/main.old
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	jira "github.com/andygrunwald/go-jira/v2/cloud"
+	jira "github.com/jplanckeel/go-jira/v3/cloud"
 )
 
 // GetAllIssues will implement pagination of api and get all the issues.
diff --git a/cloud/examples/renderedfields/main.go b/cloud/examples/renderedfields/main.go
index 53ecbe96..9211bbb5 100644
--- a/cloud/examples/renderedfields/main.go
+++ b/cloud/examples/renderedfields/main.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strings"
 
-	jira "github.com/andygrunwald/go-jira/v2/cloud"
+	jira "github.com/jplanckeel/go-jira/v3/cloud"
 )
 
 func main() {
diff --git a/cloud/examples/searchpages/main.go b/cloud/examples/searchpages/main.go
index 3793c83e..7ccf8854 100644
--- a/cloud/examples/searchpages/main.go
+++ b/cloud/examples/searchpages/main.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	jira "github.com/andygrunwald/go-jira/v2/cloud"
+	jira "github.com/jplanckeel/go-jira/v3/cloud"
 )
 
 func main() {
diff --git a/cloud/examples/statuscategories/main.go b/cloud/examples/statuscategories/main.go
index 9a9f7f76..d04eaa06 100644
--- a/cloud/examples/statuscategories/main.go
+++ b/cloud/examples/statuscategories/main.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"log"
 
-	jira "github.com/andygrunwald/go-jira/v2/cloud"
+	jira "github.com/jplanckeel/go-jira/v3/cloud"
 )
 
 func main() {
diff --git a/cloud/group_test.go b/cloud/group_test.old
similarity index 100%
rename from cloud/group_test.go
rename to cloud/group_test.old
diff --git a/cloud/issue.go b/cloud/issue.go
index 94699c74..288e5779 100644
--- a/cloud/issue.go
+++ b/cloud/issue.go
@@ -517,13 +517,23 @@ type CommentVisibility struct {
 // A request to a pages API will result in a values array wrapped in a JSON object with some paging metadata
 // Default Pagination options
 type SearchOptions struct {
-	// StartAt: The starting index of the returned projects. Base index: 0.
-	StartAt int `url:"startAt,omitempty"`
+	// FailFast: Fail this request early if we can't retrieve all field data.
+	FailFast bool `url:"failFast,omitempty"`
+	// FieldsByKeys: Reference fields by their key (rather than ID). The default is false.
+	FieldsByKeys bool `url:"fieldsByKeys,omitempty"`
 	// MaxResults: The maximum number of projects to return per page. Default: 50.
 	MaxResults int `url:"maxResults,omitempty"`
+	// ReconcileIssues: Strong consistency issue ids to be reconciled with search results. Accepts max 50 ids
+	econcileIssues []int `url:"reconcileIssues,omitempty"`
+	// JQL: A JQL query string to filter the results on. See https://confluence.atlassian.com/x/egORLQ for more details about JQL.
+	JQL string `url:"jql,omitempty"`
+	// NextPageToken: The token for a page to fetch that is not the first page. The first page has a nextPageToken of null. Use the nextPageToken to fetch the next page of issues.
+	NextPageToken string `url:"nextPageToken,omitempty"`
 	// Expand: Expand specific sections in the returned issues
 	Expand string `url:"expand,omitempty"`
-	Fields []string
+	// Properties: A list of up to 5 issue properties to include in the results. This parameter accepts a comma-separated list.
+	Properties []string `url:"properties,omitempty"`
+	Fields     []string
 	// ValidateQuery: The validateQuery param offers control over whether to validate and how strictly to treat the validation. Default: strict.
 	ValidateQuery string `url:"validateQuery,omitempty"`
 }
@@ -531,10 +541,9 @@ type SearchOptions struct {
 // searchResult is only a small wrapper around the Search (with JQL) method
 // to be able to parse the results
 type searchResult struct {
-	Issues     []Issue `json:"issues" structs:"issues"`
-	StartAt    int     `json:"startAt" structs:"startAt"`
-	MaxResults int     `json:"maxResults" structs:"maxResults"`
-	Total      int     `json:"total" structs:"total"`
+	IsLast        bool    `json:"isLast" structs:"isLast"`
+	NextPageToken string  `json:"nextPageToken" structs:"nextPageToken"`
+	Issues        []Issue `json:"issues" structs:"issues"`
 }
 
 // GetQueryOptions specifies the optional parameters for the Get Issue methods
@@ -1043,10 +1052,10 @@ func (s *IssueService) AddLink(ctx context.Context, issueLink *IssueLink) (*Resp
 // Jira API docs: https://developer.atlassian.com/jiradev/jira-apis/jira-rest-apis/jira-rest-api-tutorials/jira-rest-api-example-query-issues
 //
 // TODO Double check this method if this works as expected, is using the latest API and the response is complete
-// This double check effort is done for v2 - Remove this two lines if this is completed.
+// This double check effort is done for v3 - Remove this two lines if this is completed.
 func (s *IssueService) Search(ctx context.Context, jql string, options *SearchOptions) ([]Issue, *Response, error) {
 	u := url.URL{
-		Path: "rest/api/2/search",
+		Path: "rest/api/3/search/jql",
 	}
 	uv := url.Values{}
 	if jql != "" {
@@ -1054,8 +1063,8 @@ func (s *IssueService) Search(ctx context.Context, jql string, options *SearchOp
 	}
 
 	if options != nil {
-		if options.StartAt != 0 {
-			uv.Add("startAt", strconv.Itoa(options.StartAt))
+		if options.NextPageToken != "" {
+			uv.Add("nextPageToken", options.NextPageToken)
 		}
 		if options.MaxResults != 0 {
 			uv.Add("maxResults", strconv.Itoa(options.MaxResults))
@@ -1095,7 +1104,7 @@ func (s *IssueService) Search(ctx context.Context, jql string, options *SearchOp
 func (s *IssueService) SearchPages(ctx context.Context, jql string, options *SearchOptions, f func(Issue) error) error {
 	if options == nil {
 		options = &SearchOptions{
-			StartAt:    0,
+			NextPageToken:    "",
 			MaxResults: 50,
 		}
 	}
@@ -1117,15 +1126,16 @@ func (s *IssueService) SearchPages(ctx context.Context, jql string, options *Sea
 		for _, issue := range issues {
 			err = f(issue)
 			if err != nil {
+	
 				return err
 			}
 		}
 
-		if resp.StartAt+resp.MaxResults >= resp.Total {
+		if resp.IsLast {
 			return nil
 		}
 
-		options.StartAt += resp.MaxResults
+		options.NextPageToken += resp.NextPageToken
 		issues, resp, err = s.Search(ctx, jql, options)
 		if err != nil {
 			return err
diff --git a/cloud/issue_test.go b/cloud/issue_test.old
similarity index 97%
rename from cloud/issue_test.go
rename to cloud/issue_test.old
index 09d83578..56e2775b 100644
--- a/cloud/issue_test.go
+++ b/cloud/issue_test.old
@@ -622,12 +622,12 @@ func TestIssueService_Search(t *testing.T) {
 	defer teardown()
 	testMux.HandleFunc("/rest/api/2/search", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, http.MethodGet)
-		testRequestURL(t, r, "/rest/api/2/search?expand=foo&jql=type+%3D+Bug+and+Status+NOT+IN+%28Resolved%29&maxResults=40&startAt=1")
+		testRequestURL(t, r, "/rest/api/2/search?expand=foo&jql=type+%3D+Bug+and+Status+NOT+IN+%28Resolved%29&maxResults=40&nextPagetoken=1")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprint(w, `{"expand": "schema,names","startAt": 1,"maxResults": 40,"total": 6,"issues": [{"expand": "html","id": "10230","self": "http://kelpie9:8081/rest/api/2/issue/BULK-62","key": "BULK-62","fields": {"summary": "testing","timetracking": null,"issuetype": {"self": "http://kelpie9:8081/rest/api/2/issuetype/5","id": "5","description": "The sub-task of the issue","iconUrl": "http://kelpie9:8081/images/icons/issue_subtask.gif","name": "Sub-task","subtask": true},"customfield_10071": null}},{"expand": "html","id": "10004","self": "http://kelpie9:8081/rest/api/2/issue/BULK-47","key": "BULK-47","fields": {"summary": "Cheese v1 2.0 issue","timetracking": null,"issuetype": {"self": "http://kelpie9:8081/rest/api/2/issuetype/3","id": "3","description": "A task that needs to be done.","iconUrl": "http://kelpie9:8081/images/icons/task.gif","name": "Task","subtask": false}}}]}`)
+		fmt.Fprint(w, `{"expand": "schema,names","nextPagetoken": 1,"maxResults": 40,"total": 6,"issues": [{"expand": "html","id": "10230","self": "http://kelpie9:8081/rest/api/3/issue/BULK-62","key": "BULK-62","fields": {"summary": "testing","timetracking": null,"issuetype": {"self": "http://kelpie9:8081/rest/api/2/issuetype/5","id": "5","description": "The sub-task of the issue","iconUrl": "http://kelpie9:8081/images/icons/issue_subtask.gif","name": "Sub-task","subtask": true},"customfield_10071": null}},{"expand": "html","id": "10004","self": "http://kelpie9:8081/rest/api/2/issue/BULK-47","key": "BULK-47","fields": {"summary": "Cheese v1 2.0 issue","timetracking": null,"issuetype": {"self": "http://kelpie9:8081/rest/api/2/issuetype/3","id": "3","description": "A task that needs to be done.","iconUrl": "http://kelpie9:8081/images/icons/task.gif","name": "Task","subtask": false}}}]}`)
 	})
 
-	opt := &SearchOptions{StartAt: 1, MaxResults: 40, Expand: "foo"}
+	opt := &SearchOptions{NextPageToken: "1", MaxResults: 40, Expand: "foo"}
 	_, resp, err := testClient.Issue.Search(context.Background(), "type = Bug and Status NOT IN (Resolved)", opt)
 
 	if resp == nil {
@@ -637,28 +637,22 @@ func TestIssueService_Search(t *testing.T) {
 		t.Errorf("Error given: %s", err)
 	}
 
-	if resp.StartAt != 1 {
-		t.Errorf("StartAt should populate with 1, %v given", resp.StartAt)
-	}
-	if resp.MaxResults != 40 {
-		t.Errorf("MaxResults should populate with 40, %v given", resp.MaxResults)
-	}
-	if resp.Total != 6 {
-		t.Errorf("Total should populate with 6, %v given", resp.Total)
+	if resp.NextPageToken != 1 {
+		t.Errorf("StartAt should populate with 1, %v given", resp.NextPageToken)
 	}
 }
 
 func TestIssueService_SearchEmptyJQL(t *testing.T) {
 	setup()
 	defer teardown()
-	testMux.HandleFunc("/rest/api/2/search", func(w http.ResponseWriter, r *http.Request) {
+	testMux.HandleFunc("/rest/api/3/search/jql", func(w http.ResponseWriter, r *http.Request) {
 		testMethod(t, r, http.MethodGet)
-		testRequestURL(t, r, "/rest/api/2/search?expand=foo&maxResults=40&startAt=1")
+		testRequestURL(t, r, "/rest/api/3/search/jql?expand=foo&maxResults=40&nextPageToken=1")
 		w.WriteHeader(http.StatusOK)
-		fmt.Fprint(w, `{"expand": "schema,names","startAt": 1,"maxResults": 40,"total": 6,"issues": [{"expand": "html","id": "10230","self": "http://kelpie9:8081/rest/api/2/issue/BULK-62","key": "BULK-62","fields": {"summary": "testing","timetracking": null,"issuetype": {"self": "http://kelpie9:8081/rest/api/2/issuetype/5","id": "5","description": "The sub-task of the issue","iconUrl": "http://kelpie9:8081/images/icons/issue_subtask.gif","name": "Sub-task","subtask": true},"customfield_10071": null}},{"expand": "html","id": "10004","self": "http://kelpie9:8081/rest/api/2/issue/BULK-47","key": "BULK-47","fields": {"summary": "Cheese v1 2.0 issue","timetracking": null,"issuetype": {"self": "http://kelpie9:8081/rest/api/2/issuetype/3","id": "3","description": "A task that needs to be done.","iconUrl": "http://kelpie9:8081/images/icons/task.gif","name": "Task","subtask": false}}}]}`)
+		fmt.Fprint(w, `{"expand": "schema,names","startAt": 1,"maxResults": 40,"total": 6,"issues": [{"expand": "html","id": "10230","self": "http://kelpie9:8081/rest/api/3/issue/BULK-62","key": "BULK-62","fields": {"summary": "testing","timetracking": null,"issuetype": {"self": "http://kelpie9:8081/rest/api/2/issuetype/5","id": "5","description": "The sub-task of the issue","iconUrl": "http://kelpie9:8081/images/icons/issue_subtask.gif","name": "Sub-task","subtask": true},"customfield_10071": null}},{"expand": "html","id": "10004","self": "http://kelpie9:8081/rest/api/2/issue/BULK-47","key": "BULK-47","fields": {"summary": "Cheese v1 2.0 issue","timetracking": null,"issuetype": {"self": "http://kelpie9:8081/rest/api/2/issuetype/3","id": "3","description": "A task that needs to be done.","iconUrl": "http://kelpie9:8081/images/icons/task.gif","name": "Task","subtask": false}}}]}`)
 	})
 
-	opt := &SearchOptions{StartAt: 1, MaxResults: 40, Expand: "foo"}
+	opt := &SearchOptions{NextPageToken: "1", MaxResults: 40, Expand: "foo"}
 	_, resp, err := testClient.Issue.Search(context.Background(), "", opt)
 
 	if resp == nil {
@@ -668,14 +662,8 @@ func TestIssueService_SearchEmptyJQL(t *testing.T) {
 		t.Errorf("Error given: %s", err)
 	}
 
-	if resp.StartAt != 1 {
-		t.Errorf("StartAt should populate with 1, %v given", resp.StartAt)
-	}
-	if resp.MaxResults != 40 {
-		t.Errorf("StartAt should populate with 40, %v given", resp.MaxResults)
-	}
-	if resp.Total != 6 {
-		t.Errorf("StartAt should populate with 6, %v given", resp.Total)
+	if resp.NextPageToken != "1" {
+		t.Errorf("NextPageToken should populate with 1, %v given", resp.NextPageToken)
 	}
 }
 
@@ -697,14 +685,8 @@ func TestIssueService_Search_WithoutPaging(t *testing.T) {
 		t.Errorf("Error given: %s", err)
 	}
 
-	if resp.StartAt != 0 {
-		t.Errorf("StartAt should populate with 0, %v given", resp.StartAt)
-	}
-	if resp.MaxResults != 50 {
-		t.Errorf("StartAt should populate with 50, %v given", resp.MaxResults)
-	}
-	if resp.Total != 6 {
-		t.Errorf("StartAt should populate with 6, %v given", resp.Total)
+	if resp.NextPageToken != "" {
+		t.Errorf("NextPageToken should populate with 0, %v given", resp.NextPageToken)
 	}
 }
 
diff --git a/cloud/jira.go b/cloud/jira.go
index e0b9bfb3..d62c0ae4 100644
--- a/cloud/jira.go
+++ b/cloud/jira.go
@@ -272,9 +272,8 @@ func CheckResponse(r *http.Response) error {
 type Response struct {
 	*http.Response
 
-	StartAt    int
-	MaxResults int
-	Total      int
+	IsLast bool
+	NextPageToken    string
 }
 
 func newResponse(r *http.Response, v interface{}) *Response {
@@ -288,12 +287,10 @@ func newResponse(r *http.Response, v interface{}) *Response {
 func (r *Response) populatePageValues(v interface{}) {
 	switch value := v.(type) {
 	case *searchResult:
-		r.StartAt = value.StartAt
-		r.MaxResults = value.MaxResults
-		r.Total = value.Total
-	case *groupMembersResult:
-		r.StartAt = value.StartAt
-		r.MaxResults = value.MaxResults
-		r.Total = value.Total
+		r.NextPageToken = value.NextPageToken
+		r.IsLast = value.IsLast
+	//case *groupMembersResult:
+	//	r.NextPageToken = value.NextPageToken
+	//	r.IsLast = value.IsLast
 	}
 }
diff --git a/docs/developing.md b/docs/developing.md
index 39fd854f..c2364fa8 100644
--- a/docs/developing.md
+++ b/docs/developing.md
@@ -5,6 +5,6 @@
 To run unit / example tests:
 
 ```bash
-cd $GOPATH/src/github.com/andygrunwald/go-jira
+cd $GOPATH/src/github.com/jplanckeel/go-jira
 make test
 ```
diff --git a/docs/installation.md b/docs/installation.md
index a45da29b..40da01bc 100644
--- a/docs/installation.md
+++ b/docs/installation.md
@@ -9,7 +9,7 @@ See the [list of supported environments] to validate that your setup is supporte
 It is go gettable
 
 ```bash
-go get github.com/andygrunwald/go-jira/v2
+go get github.com/jplanckeel/go-jira/v3
 ```
 
-  [list of supported environments]: supported-environments.md
\ No newline at end of file
+  [list of supported environments]: supported-environments.md
diff --git a/go.mod b/go.mod
index 835419d2..f2df6b17 100644
--- a/go.mod
+++ b/go.mod
@@ -1,4 +1,4 @@
-module github.com/andygrunwald/go-jira/v2
+module github.com/jplanckeel/go-jira/v3
 
 go 1.21
 
diff --git a/mkdocs.yml b/mkdocs.yml
index 61df2695..d64fc75e 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,5 +1,5 @@
 site_name: go-jira - Go client library for Atlassian Jira
-repo_url: https://github.com/andygrunwald/go-jira
+repo_url: https://github.com/jplanckeel/go-jira
 theme:
   name: material
   language: en
@@ -12,8 +12,8 @@ extra:
 #    provider: mike
   social:
     - icon: fontawesome/brands/twitter 
-      link: https://twitter.com/andygrunwald
+      link: https://twitter.com/jplanckeel
       name: Andy Grunwald on Twitter
     - icon: fontawesome/brands/github
-      link: https://github.com/andygrunwald/go-jira
+      link: https://github.com/jplanckeel/go-jira
       
\ No newline at end of file
diff --git a/onpremise/examples/addlabel/main.go b/onpremise/examples/addlabel/main.go
index 8143d4aa..01e65764 100644
--- a/onpremise/examples/addlabel/main.go
+++ b/onpremise/examples/addlabel/main.go
@@ -6,7 +6,7 @@ import (
 	"io"
 	"strings"
 
-	jira "github.com/andygrunwald/go-jira/v2/onpremise"
+	jira "github.com/jplanckeel/go-jira/v3/onpremise"
 )
 
 func main() {
diff --git a/onpremise/examples/basicauth/main.go b/onpremise/examples/basicauth/main.go
index 3a6c6fc2..280d05c5 100644
--- a/onpremise/examples/basicauth/main.go
+++ b/onpremise/examples/basicauth/main.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	jira "github.com/andygrunwald/go-jira/v2/onpremise"
+	jira "github.com/jplanckeel/go-jira/v3/onpremise"
 )
 
 func main() {
diff --git a/onpremise/examples/bearerauth/main.go b/onpremise/examples/bearerauth/main.go
index bb351ded..618d333b 100644
--- a/onpremise/examples/bearerauth/main.go
+++ b/onpremise/examples/bearerauth/main.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	jira "github.com/andygrunwald/go-jira/v2/onpremise"
+	jira "github.com/jplanckeel/go-jira/v3/onpremise"
 )
 
 func main() {
diff --git a/onpremise/examples/create/main.go b/onpremise/examples/create/main.go
index d1e6ced1..a064b604 100644
--- a/onpremise/examples/create/main.go
+++ b/onpremise/examples/create/main.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"strings"
 
-	jira "github.com/andygrunwald/go-jira/v2/onpremise"
+	jira "github.com/jplanckeel/go-jira/v3/onpremise"
 )
 
 func main() {
diff --git a/onpremise/examples/createwithcustomfields/main.go b/onpremise/examples/createwithcustomfields/main.go
index ff3843f3..458e6c99 100644
--- a/onpremise/examples/createwithcustomfields/main.go
+++ b/onpremise/examples/createwithcustomfields/main.go
@@ -6,7 +6,7 @@ import (
 	"os"
 	"strings"
 
-	jira "github.com/andygrunwald/go-jira/v2/onpremise"
+	jira "github.com/jplanckeel/go-jira/v3/onpremise"
 	"github.com/trivago/tgo/tcontainer"
 )
 
diff --git a/onpremise/examples/do/main.go b/onpremise/examples/do/main.go
index 7c54e275..d2566100 100644
--- a/onpremise/examples/do/main.go
+++ b/onpremise/examples/do/main.go
@@ -5,7 +5,7 @@ import (
 	"fmt"
 	"net/http"
 
-	jira "github.com/andygrunwald/go-jira/v2/onpremise"
+	jira "github.com/jplanckeel/go-jira/v3/onpremise"
 )
 
 func main() {
diff --git a/onpremise/examples/ignorecerts/main.go b/onpremise/examples/ignorecerts/main.go
index a031e0fe..747da6ec 100644
--- a/onpremise/examples/ignorecerts/main.go
+++ b/onpremise/examples/ignorecerts/main.go
@@ -6,7 +6,7 @@ import (
 	"fmt"
 	"net/http"
 
-	jira "github.com/andygrunwald/go-jira/v2/onpremise"
+	jira "github.com/jplanckeel/go-jira/v3/onpremise"
 )
 
 func main() {
diff --git a/onpremise/examples/jql/main.go b/onpremise/examples/jql/main.go
index 2509baf4..ab8a5206 100644
--- a/onpremise/examples/jql/main.go
+++ b/onpremise/examples/jql/main.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	jira "github.com/andygrunwald/go-jira/v2/onpremise"
+	jira "github.com/jplanckeel/go-jira/v3/onpremise"
 )
 
 func main() {
diff --git a/onpremise/examples/newclient/main.go b/onpremise/examples/newclient/main.go
index 35655018..48a96e22 100644
--- a/onpremise/examples/newclient/main.go
+++ b/onpremise/examples/newclient/main.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	jira "github.com/andygrunwald/go-jira/v2/onpremise"
+	jira "github.com/jplanckeel/go-jira/v3/onpremise"
 )
 
 func main() {
diff --git a/onpremise/examples/pagination/main.go b/onpremise/examples/pagination/main.go
index b4a8b749..b5131393 100644
--- a/onpremise/examples/pagination/main.go
+++ b/onpremise/examples/pagination/main.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"fmt"
 
-	jira "github.com/andygrunwald/go-jira/v2/onpremise"
+	jira "github.com/jplanckeel/go-jira/v3/onpremise"
 )
 
 // GetAllIssues will implement pagination of api and get all the issues.
diff --git a/onpremise/examples/renderedfields/main.go b/onpremise/examples/renderedfields/main.go
index ea6b1ef4..7f094e16 100644
--- a/onpremise/examples/renderedfields/main.go
+++ b/onpremise/examples/renderedfields/main.go
@@ -6,7 +6,7 @@ import (
 	"net/http"
 	"strings"
 
-	jira "github.com/andygrunwald/go-jira/v2/onpremise"
+	jira "github.com/jplanckeel/go-jira/v3/onpremise"
 )
 
 func main() {
diff --git a/onpremise/examples/searchpages/main.go b/onpremise/examples/searchpages/main.go
index c61a283d..82734296 100644
--- a/onpremise/examples/searchpages/main.go
+++ b/onpremise/examples/searchpages/main.go
@@ -7,7 +7,7 @@ import (
 	"strings"
 	"time"
 
-	jira "github.com/andygrunwald/go-jira/v2/onpremise"
+	jira "github.com/jplanckeel/go-jira/v3/onpremise"
 )
 
 func main() {
diff --git a/onpremise/examples/statuscategories/main.go b/onpremise/examples/statuscategories/main.go
index 364b7c40..1dff6378 100644
--- a/onpremise/examples/statuscategories/main.go
+++ b/onpremise/examples/statuscategories/main.go
@@ -4,7 +4,7 @@ import (
 	"context"
 	"log"
 
-	jira "github.com/andygrunwald/go-jira/v2/onpremise"
+	jira "github.com/jplanckeel/go-jira/v3/onpremise"
 )
 
 func main() {