Repository: ctreminiom/go-atlassian
Pull request #298 (2024-08-03 09:12:54)

Updated code style
Took 55 minutes


Patch:
diff --git a/admin/internal/organization_impl.go b/admin/internal/organization_impl.go
index 0a77e12..d2cff03 100644
--- a/admin/internal/organization_impl.go
+++ b/admin/internal/organization_impl.go
@@ -3,19 +3,22 @@ package internal
 import (
 	"context"
 	"fmt"
-	model "github.com/ctreminiom/go-atlassian/pkg/infra/models"
-	"github.com/ctreminiom/go-atlassian/service"
-	"github.com/ctreminiom/go-atlassian/service/admin"
 	"net/http"
 	"net/url"
 	"strconv"
 	"strings"
+
+	model "github.com/ctreminiom/go-atlassian/pkg/infra/models"
+	"github.com/ctreminiom/go-atlassian/service"
+	"github.com/ctreminiom/go-atlassian/service/admin"
 )
 
+// NewOrganizationService creates a new instance of the OrganizationService.
 func NewOrganizationService(client service.Connector, policy *OrganizationPolicyService, directory *OrganizationDirectoryService) *OrganizationService {
 	return &OrganizationService{internalClient: &internalOrganizationImpl{c: client}, Policy: policy, Directory: directory}
 }
 
+// OrganizationService handles communication with the organization related methods of the Atlassian Admin API.
 type OrganizationService struct {
 	internalClient admin.OrganizationConnector
 	Policy         *OrganizationPolicyService
@@ -33,7 +36,7 @@ func (o *OrganizationService) Gets(ctx context.Context, cursor string) (*model.A
 
 // Get returns information about a single organization by ID
 //
-// GET /admin/v1/orgs/{orgId}
+// GET /admin/v1/orgs/{organizationID}
 //
 // https://docs.go-atlassian.io/atlassian-admin-cloud/organization#get-an-organization-by-id
 func (o *OrganizationService) Get(ctx context.Context, organizationID string) (*model.AdminOrganizationScheme, *model.ResponseScheme, error) {
@@ -42,7 +45,7 @@ func (o *OrganizationService) Get(ctx context.Context, organizationID string) (*
 
 // Users returns a list of users in an organization.
 //
-// GET /admin/v1/orgs/{orgId}/users
+// GET /admin/v1/orgs/{organizationID}/users
 //
 // https://docs.go-atlassian.io/atlassian-admin-cloud/organization#get-users-in-an-organization
 func (o *OrganizationService) Users(ctx context.Context, organizationID, cursor string) (*model.OrganizationUserPageScheme, *model.ResponseScheme, error) {
@@ -51,7 +54,7 @@ func (o *OrganizationService) Users(ctx context.Context, organizationID, cursor
 
 // Domains returns a list of domains in an organization one page at a time.
 //
-// GET /admin/v1/orgs/{orgId}/domains
+// GET /admin/v1/orgs/{organizationID}/domains
 //
 // https://docs.go-atlassian.io/atlassian-admin-cloud/organization#get-domains-in-an-organization
 func (o *OrganizationService) Domains(ctx context.Context, organizationID, cursor string) (*model.OrganizationDomainPageScheme, *model.ResponseScheme, error) {
@@ -60,7 +63,7 @@ func (o *OrganizationService) Domains(ctx context.Context, organizationID, curso
 
 // Domain returns information about a single verified domain by ID.
 //
-// GET /admin/v1/orgs/{orgId}/domains/{domainId}
+// GET /admin/v1/orgs/{organizationID}/domains/{domainID}
 //
 // https://docs.go-atlassian.io/atlassian-admin-cloud/organization#get-domain-by-id
 func (o *OrganizationService) Domain(ctx context.Context, organizationID, domainID string) (*model.OrganizationDomainScheme, *model.ResponseScheme, error) {
@@ -69,7 +72,7 @@ func (o *OrganizationService) Domain(ctx context.Context, organizationID, domain
 
 // Events returns an audit log of events from an organization one page at a time.
 //
-// GET /admin/v1/orgs/{orgId}/events
+// GET /admin/v1/orgs/{organizationID}/events
 //
 // https://docs.go-atlassian.io/atlassian-admin-cloud/organization#get-an-audit-log-of-events
 func (o *OrganizationService) Events(ctx context.Context, organizationID string, options *model.OrganizationEventOptScheme, cursor string) (*model.OrganizationEventPageScheme, *model.ResponseScheme, error) {
@@ -78,7 +81,7 @@ func (o *OrganizationService) Events(ctx context.Context, organizationID string,
 
 // Event returns information about a single event by ID.
 //
-// GET /admin/v1/orgs/{orgId}/events/{eventId}
+// GET /admin/v1/orgs/{organizationID}/events/{eventID}
 //
 // https://docs.go-atlassian.io/atlassian-admin-cloud/organization#get-an-event-by-id
 func (o *OrganizationService) Event(ctx context.Context, organizationID, eventID string) (*model.OrganizationEventScheme, *model.ResponseScheme, error) {
@@ -87,7 +90,7 @@ func (o *OrganizationService) Event(ctx context.Context, organizationID, eventID
 
 // Actions returns information localized event actions.
 //
-// GET /admin/v1/orgs/{orgId}/event-actions
+// GET /admin/v1/orgs/{organizationID}/event-actions
 //
 // https://docs.go-atlassian.io/atlassian-admin-cloud/organization#get-list-of-event-actions
 func (o *OrganizationService) Actions(ctx context.Context, organizationID string) (*model.OrganizationEventActionScheme, *model.ResponseScheme, error) {
diff --git a/bitbucket/api_client_impl.go b/bitbucket/api_client_impl.go
index 5f9d94b..d359e72 100644
--- a/bitbucket/api_client_impl.go
+++ b/bitbucket/api_client_impl.go
@@ -62,7 +62,7 @@ type Client struct {
 }
 
 // NewRequest creates an API request.
-func (c *Client) NewRequest(ctx context.Context, method, urlStr, type_ string, body interface{}) (*http.Request, error) {
+func (c *Client) NewRequest(ctx context.Context, method, urlStr, typ string, body interface{}) (*http.Request, error) {
 
 	rel, err := url.Parse(urlStr)
 	if err != nil {
@@ -95,9 +95,9 @@ func (c *Client) NewRequest(ctx context.Context, method, urlStr, type_ string, b
 		req.Header.Set("Content-Type", "application/json")
 	}
 
-	if type_ != "" {
-		// When the type_ is provided, it means the request needs to be created to handle files
-		req.Header.Set("Content-Type", type_)
+	if typ != "" {
+		// When the typ is provided, it means the request needs to be created to handle files
+		req.Header.Set("Content-Type", typ)
 		req.Header.Set("X-Atlassian-Token", "no-check")
 	}
 
diff --git a/bitbucket/internal/authentication_impl.go b/bitbucket/internal/authentication_impl.go
index 2bbe9ab..4c540a2 100644
--- a/bitbucket/internal/authentication_impl.go
+++ b/bitbucket/internal/authentication_impl.go
@@ -5,10 +5,12 @@ import (
 	"github.com/ctreminiom/go-atlassian/service/common"
 )
 
+// NewAuthenticationService returns a new instance of the AuthenticationService.
 func NewAuthenticationService(client service.Connector) common.Authentication {
 	return &AuthenticationService{c: client}
 }
 
+// AuthenticationService handles communication with the authentication related.
 type AuthenticationService struct {
 	c service.Connector
 
@@ -19,19 +21,25 @@ type AuthenticationService struct {
 	agent             string
 }
 
+// SetBearerToken sets the token to be used in the Authorization header.
 func (a *AuthenticationService) SetBearerToken(token string) {
 	a.token = token
 }
 
+// GetBearerToken returns the token used in the Authorization header.
 func (a *AuthenticationService) GetBearerToken() string {
 	return a.token
 }
+
+// SetExperimentalFlag sets the experimental flag to be used in the Authorization header.
 func (a *AuthenticationService) SetExperimentalFlag() {}
 
+// HasSetExperimentalFlag returns if the experimental flag was set.
 func (a *AuthenticationService) HasSetExperimentalFlag() bool {
 	return false
 }
 
+// SetBasicAuth sets the mail and token to be used in the Authorization header.
 func (a *AuthenticationService) SetBasicAuth(mail, token string) {
 	a.mail = mail
 	a.token = token
@@ -39,23 +47,28 @@ func (a *AuthenticationService) SetBasicAuth(mail, token string) {
 	a.basicAuthProvided = true
 }
 
+// GetBasicAuth returns the mail and token used in the Authorization header.
 func (a *AuthenticationService) GetBasicAuth() (string, string) {
 	return a.mail, a.token
 }
 
+// HasBasicAuth returns if the mail and token were set.
 func (a *AuthenticationService) HasBasicAuth() bool {
 	return a.basicAuthProvided
 }
 
+// SetUserAgent sets the agent to be used in the User-Agent header.
 func (a *AuthenticationService) SetUserAgent(agent string) {
 	a.agent = agent
 	a.userAgentProvided = true
 }
 
+// GetUserAgent returns the agent used in the User-Agent header.
 func (a *AuthenticationService) GetUserAgent() string {
 	return a.agent
 }
 
+// HasUserAgent returns if the agent was set.
 func (a *AuthenticationService) HasUserAgent() bool {
 	return a.userAgentProvided
 }
diff --git a/bitbucket/internal/workspace_impl.go b/bitbucket/internal/workspace_impl.go
index c6389ce..1225eb1 100644
--- a/bitbucket/internal/workspace_impl.go
+++ b/bitbucket/internal/workspace_impl.go
@@ -3,12 +3,14 @@ package internal
 import (
 	"context"
 	"fmt"
+	"net/http"
+
 	model "github.com/ctreminiom/go-atlassian/pkg/infra/models"
 	"github.com/ctreminiom/go-atlassian/service"
 	"github.com/ctreminiom/go-atlassian/service/bitbucket"
-	"net/http"
 )
 
+// NewWorkspaceService handles communication with the workspace related methods of the Bitbucket API.
 func NewWorkspaceService(client service.Connector, webhook *WorkspaceHookService, permission *WorkspacePermissionService) *WorkspaceService {
 
 	return &WorkspaceService{
@@ -18,6 +20,7 @@ func NewWorkspaceService(client service.Connector, webhook *WorkspaceHookService
 	}
 }
 
+// WorkspaceService handles communication with the workspace related methods of the Bitbucket API.
 type WorkspaceService struct {
 	internalClient bitbucket.WorkspaceConnector
 	Hook           *WorkspaceHookService
@@ -42,15 +45,15 @@ func (w *WorkspaceService) Members(ctx context.Context, workspace string) (*mode
 	return w.internalClient.Members(ctx, workspace)
 }
 
-// Membership returns the workspace membership,
+// Membership returns the workspace membership.
 //
 // which includes a User object for the member and a Workspace object for the requested workspace.
 //
-// GET /2.0/workspaces/{workspace}/members/{member}
+// GET /2.0/workspaces/{workspace}/members/{memberID}
 //
 // https://docs.go-atlassian.io/bitbucket-cloud/workspace#get-member-in-a-workspace
-func (w *WorkspaceService) Membership(ctx context.Context, workspace, memberId string) (*model.WorkspaceMembershipScheme, *model.ResponseScheme, error) {
-	return w.internalClient.Membership(ctx, workspace, memberId)
+func (w *WorkspaceService) Membership(ctx context.Context, workspace, memberID string) (*model.WorkspaceMembershipScheme, *model.ResponseScheme, error) {
+	return w.internalClient.Membership(ctx, workspace, memberID)
 }
 
 // Projects returns the list of projects in this workspace.
@@ -66,6 +69,7 @@ type internalWorkspaceServiceImpl struct {
 	c service.Connector
 }
 
+// Get returns the requested workspace.
 func (i *internalWorkspaceServiceImpl) Get(ctx context.Context, workspace string) (*model.WorkspaceScheme, *model.ResponseScheme, error) {
 
 	if workspace == "" {
@@ -88,6 +92,7 @@ func (i *internalWorkspaceServiceImpl) Get(ctx context.Context, workspace string
 	return result, response, nil
 }
 
+// Members returns all members of the requested workspace.
 func (i *internalWorkspaceServiceImpl) Members(ctx context.Context, workspace string) (*model.WorkspaceMembershipPageScheme, *model.ResponseScheme, error) {
 
 	if workspace == "" {
@@ -110,6 +115,7 @@ func (i *internalWorkspaceServiceImpl) Members(ctx context.Context, workspace st
 	return page, response, nil
 }
 
+// Membership returns the workspace membership.
 func (i *internalWorkspaceServiceImpl) Membership(ctx context.Context, workspace, memberId string) (*model.WorkspaceMembershipScheme, *model.ResponseScheme, error) {
 
 	if workspace == "" {
@@ -136,6 +142,7 @@ func (i *internalWorkspaceServiceImpl) Membership(ctx context.Context, workspace
 	return member, response, nil
 }
 
+// Projects returns the list of projects in this workspace.
 func (i *internalWorkspaceServiceImpl) Projects(ctx context.Context, workspace string) (*model.BitbucketProjectPageScheme, *model.ResponseScheme, error) {
 
 	if workspace == "" {
diff --git a/jira/internal/group_user_picker_impl.go b/jira/internal/group_user_picker_impl.go
index ef879ce..068fb7b 100644
--- a/jira/internal/group_user_picker_impl.go
+++ b/jira/internal/group_user_picker_impl.go
@@ -23,6 +23,7 @@ func NewGroupUserPickerService(client service.Connector, version string) (*Group
 	}, nil
 }
 
+// GroupUserPickerService handles communication with the GroupUserPicker related methods of the Jira API.
 type GroupUserPickerService struct {
 	internalClient jira.GroupUserPickerConnector
 }
@@ -41,6 +42,7 @@ type internalGroupUserPickerServiceImpl struct {
 	version string
 }
 
+// Find returns a list of users and groups matching a string.
 func (i internalGroupUserPickerServiceImpl) Find(ctx context.Context, options *model.GroupUserPickerFindOptionScheme) (*model.GroupUserPickerFindScheme, *model.ResponseScheme, error) {
 
 	if options == nil || options.Query == "" {
diff --git a/jira/internal/watcher_impl.go b/jira/internal/watcher_impl.go
index 9aa8414..0ecc7a7 100644
--- a/jira/internal/watcher_impl.go
+++ b/jira/internal/watcher_impl.go
@@ -90,7 +90,7 @@ func (i *internalWatcherImpl) Add(ctx context.Context, issueKeyOrID string, acco
 
 	endpoint := fmt.Sprintf("rest/api/%v/issue/%v/watchers", i.version, issueKeyOrID)
 
-	var payload []byte = nil // add self user
+	var payload []byte // add self user
 	if len(accountID) > 0 {
 		payload = []byte(accountID[0]) // add another user
 	}
diff --git a/pkg/infra/models/agile_sprint.go b/pkg/infra/models/agile_sprint.go
index c9be4dc..134775f 100644
--- a/pkg/infra/models/agile_sprint.go
+++ b/pkg/infra/models/agile_sprint.go
@@ -71,12 +71,12 @@ type SprintIssueScheme struct {
 // Issues is a slice of the issues to be moved.
 // RankBeforeIssue is the rank of the issue before the move.
 // RankAfterIssue is the rank of the issue after the move.
-// RankCustomFieldId is the ID of the custom field used for ranking.
+// RankCustomFieldID is the ID of the custom field used for ranking.
 type SprintMovePayloadScheme struct {
 	Issues            []string `json:"issues,omitempty"`
 	RankBeforeIssue   string   `json:"rankBeforeIssue,omitempty"`
 	RankAfterIssue    string   `json:"rankAfterIssue,omitempty"`
-	RankCustomFieldId int      `json:"rankCustomFieldId,omitempty"`
+	RankCustomFieldID int      `json:"rankCustomFieldId,omitempty"`
 }
 
 // SprintDetailScheme represents the details of a sprint.
diff --git a/pkg/infra/models/assets_object.go b/pkg/infra/models/assets_object.go
index 924b3e0..89c4e51 100644
--- a/pkg/infra/models/assets_object.go
+++ b/pkg/infra/models/assets_object.go
@@ -60,7 +60,7 @@ type ObjectHistoryScheme struct {
 // Name is the name of the actor.
 // Key is the key of the actor.
 // EmailAddress is the email address of the actor.
-// Html is the HTML representation of the actor.
+// HTML is the HTML representation of the actor.
 // RenderedLink is the rendered link of the actor.
 // IsDeleted indicates if the actor is deleted.
 // LastSeenVersion is the last seen version of the actor.
@@ -71,7 +71,7 @@ type ObjectHistoryActorScheme struct {
 	Name            string `json:"name,omitempty"`            // The name of the actor.
 	Key             string `json:"key,omitempty"`             // The key of the actor.
 	EmailAddress    string `json:"emailAddress,omitempty"`    // The email address of the actor.
-	Html            string `json:"html,omitempty"`            // The HTML representation of the actor.
+	HTML            string `json:"html,omitempty"`            // The HTML representation of the actor.
 	RenderedLink    string `json:"renderedLink,omitempty"`    // The rendered link of the actor.
 	IsDeleted       bool   `json:"isDeleted,omitempty"`       // Indicates if the actor is deleted.
 	LastSeenVersion string `json:"lastSeenVersion,omitempty"` // The last seen version of the actor.
@@ -277,10 +277,10 @@ type ObjectTypeAssetAttributeValueScheme struct {
 }
 
 // ObjectTypeAssetAttributeValueGroupScheme represents a group of attribute values in an asset.
-// AvatarUrl is the URL of the avatar for the group.
+// AvatarURL is the URL of the avatar for the group.
 // Name is the name of the group.
 type ObjectTypeAssetAttributeValueGroupScheme struct {
-	AvatarUrl string `json:"avatarUrl,omitempty"` // The URL of the avatar for the group.
+	AvatarURL string `json:"avatarUrl,omitempty"` // The URL of the avatar for the group.
 	Name      string `json:"name,omitempty"`      // The name of the group.
 }
 
diff --git a/pkg/infra/models/jira_field.go b/pkg/infra/models/jira_field.go
index f72d899..6ef0522 100644
--- a/pkg/infra/models/jira_field.go
+++ b/pkg/infra/models/jira_field.go
@@ -83,6 +83,7 @@ type CustomFieldRequestTypeLinkScheme struct {
 	Agent    string `json:"agent,omitempty"`    // The agent link for the custom field request type.
 }
 
+// CustomFieldTempoAccountScheme represents a custom field tempo account in Jira.
 type CustomFieldTempoAccountScheme struct {
 	ID    int    `json:"id"`
 	Value string `json:"value"`
diff --git a/pkg/infra/models/jira_time.go b/pkg/infra/models/jira_time.go
index b514a74..caf2c68 100644
--- a/pkg/infra/models/jira_time.go
+++ b/pkg/infra/models/jira_time.go
@@ -3,17 +3,21 @@ package models
 import "time"
 
 const (
+	// TimeFormat is the format for Jira type "date-time".
 	TimeFormat = "2006-01-02T15:04:05-0700"
+	// DateFormat is the format for Jira type "date".
 	DateFormat = "2006-01-02"
 )
 
 // DateScheme is a custom time type for Jira dates.
 type DateScheme time.Time
 
+// MarshalJSON marshals the DateScheme to JSON.
 func (d *DateScheme) MarshalJSON() ([]byte, error) {
 	return []byte(time.Time(*d).Format(DateFormat)), nil
 }
 
+// UnmarshalJSON unmarshals the DateScheme from JSON.
 func (d *DateScheme) UnmarshalJSON(data []byte) error {
 	if string(data) == "null" {
 		return nil
@@ -31,10 +35,12 @@ func (d *DateScheme) UnmarshalJSON(data []byte) error {
 // DateTimeScheme is a custom time type for Jira times.
 type DateTimeScheme time.Time
 
+// MarshalJSON marshals the DateTimeScheme to JSON.
 func (d *DateTimeScheme) MarshalJSON() ([]byte, error) {
 	return []byte(time.Time(*d).Format(TimeFormat)), nil
 }
 
+// UnmarshalJSON unmarshals the DateTimeScheme from JSON.
 func (d *DateTimeScheme) UnmarshalJSON(data []byte) error {
 	if string(data) == "null" {
 		return nil
diff --git a/service/confluence/analytics.go b/service/confluence/analytics.go
index 0d99b01..0e7edba 100644
--- a/service/confluence/analytics.go
+++ b/service/confluence/analytics.go
@@ -2,22 +2,24 @@ package confluence
 
 import (
 	"context"
+
 	model "github.com/ctreminiom/go-atlassian/pkg/infra/models"
 )
 
+// AnalyticsConnector the interface for the analytics methods of the Confluence Service.
 type AnalyticsConnector interface {
 
 	// Get gets the total number of views a piece of content has.
 	//
-	// GET /wiki/rest/api/analytics/content/{contentId}/views
+	// GET /wiki/rest/api/analytics/content/{contentID}/views
 	//
 	// https://docs.go-atlassian.io/confluence-cloud/analytics#get-views
-	Get(ctx context.Context, contentId, fromDate string) (*model.ContentViewScheme, *model.ResponseScheme, error)
+	Get(ctx context.Context, contentID, fromDate string) (*model.ContentViewScheme, *model.ResponseScheme, error)
 
 	// Distinct get the total number of distinct viewers a piece of content has.
 	//
-	// GET /wiki/rest/api/analytics/content/{contentId}/viewers
+	// GET /wiki/rest/api/analytics/content/{contentID}/viewers
 	//
 	// https://docs.go-atlassian.io/confluence-cloud/analytics#get-viewers
-	Distinct(ctx context.Context, contentId, fromDate string) (*model.ContentViewScheme, *model.ResponseScheme, error)
+	Distinct(ctx context.Context, contentID, fromDate string) (*model.ContentViewScheme, *model.ResponseScheme, error)
 }
diff --git a/service/jira/field-config.go b/service/jira/field-config.go
index 9c18728..b57fc7a 100644
--- a/service/jira/field-config.go
+++ b/service/jira/field-config.go
@@ -46,6 +46,7 @@ type FieldConfigConnector interface {
 	Delete(ctx context.Context, id int) (*model.ResponseScheme, error)
 }
 
+// FieldConfigItemConnector interface holds the methods available for the FieldConfigItem resource.
 type FieldConfigItemConnector interface {
 
 	// Gets Returns a paginated list of all fields for a configuration.
@@ -66,6 +67,7 @@ type FieldConfigItemConnector interface {
 	Update(ctx context.Context, id int, payload *model.UpdateFieldConfigurationItemPayloadScheme) (*model.ResponseScheme, error)
 }
 
+// FieldConfigSchemeConnector interface holds the methods available for the FieldConfigScheme resource.
 type FieldConfigSchemeConnector interface {
 
 	// Gets returns a paginated list of field configuration schemes.
diff --git a/service/jira/task.go b/service/jira/task.go
index cd64bdb..f42fd44 100644
--- a/service/jira/task.go
+++ b/service/jira/task.go
@@ -2,9 +2,11 @@ package jira
 
 import (
 	"context"
+
 	model "github.com/ctreminiom/go-atlassian/pkg/infra/models"
 )
 
+// TaskConnector the interface for the task methods of the Jira Service.
 type TaskConnector interface {
 
 	// Get returns the status of a long-running asynchronous task.
@@ -15,15 +17,15 @@ type TaskConnector interface {
 	//
 	// Task details are not permanently retained.
 	//
-	// GET /rest/api/{2-3}/task/{taskId}
+	// GET /rest/api/{2-3}/task/{taskID}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/tasks#get-task
-	Get(ctx context.Context, taskId string) (*model.TaskScheme, *model.ResponseScheme, error)
+	Get(ctx context.Context, taskID string) (*model.TaskScheme, *model.ResponseScheme, error)
 
 	// Cancel cancels a task.
 	//
-	// POST /rest/api/{2-3}/task/{taskId}/cancel
+	// POST /rest/api/{2-3}/task/{taskID}/cancel
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/tasks#cancel-task
-	Cancel(ctx context.Context, taskId string) (*model.ResponseScheme, error)
+	Cancel(ctx context.Context, taskID string) (*model.ResponseScheme, error)
 }
diff --git a/service/sm/comment.go b/service/sm/comment.go
index d160315..83374fe 100644
--- a/service/sm/comment.go
+++ b/service/sm/comment.go
@@ -6,6 +6,7 @@ import (
 	model "github.com/ctreminiom/go-atlassian/pkg/infra/models"
 )
 
+// CommentConnector defines the interface for the Comment methods of the Jira Service Management REST API.
 type CommentConnector interface {
 
 	// Gets returns all comments on a customer request.


Test patch:
diff --git a/bitbucket/api_client_impl_test.go b/bitbucket/api_client_impl_test.go
index a8a34e6..71f48b7 100644
--- a/bitbucket/api_client_impl_test.go
+++ b/bitbucket/api_client_impl_test.go
@@ -274,7 +274,7 @@ func TestClient_NewRequest(t *testing.T) {
 		ctx    context.Context
 		method string
 		urlStr string
-		type_  string
+		typ    string
 		body   interface{}
 	}
 
@@ -296,7 +296,7 @@ func TestClient_NewRequest(t *testing.T) {
 				ctx:    context.Background(),
 				method: http.MethodGet,
 				urlStr: "rest/2/issue/attachment",
-				type_:  "",
+				typ:    "",
 				body:   bytes.NewReader([]byte("Hello World")),
 			},
 			want:    requestMocked,
@@ -331,7 +331,7 @@ func TestClient_NewRequest(t *testing.T) {
 				ctx:    context.Background(),
 				method: http.MethodGet,
 				urlStr: "rest/2/issue/attachment",
-				type_:  "type_sample",
+				typ:    "type_sample",
 				body:   bytes.NewReader([]byte("Hello World")),
 			},
 			want:    requestMocked,
@@ -369,7 +369,7 @@ func TestClient_NewRequest(t *testing.T) {
 				testCase.args.ctx,
 				testCase.args.method,
 				testCase.args.urlStr,
-				testCase.args.type_,
+				testCase.args.typ,
 				testCase.args.body,
 			)
 
diff --git a/bitbucket/internal/workspace_impl_test.go b/bitbucket/internal/workspace_impl_test.go
index 3167b83..4e5c25f 100644
--- a/bitbucket/internal/workspace_impl_test.go
+++ b/bitbucket/internal/workspace_impl_test.go
@@ -3,12 +3,14 @@ package internal
 import (
 	"context"
 	"errors"
+	"net/http"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
 	model "github.com/ctreminiom/go-atlassian/pkg/infra/models"
 	"github.com/ctreminiom/go-atlassian/service"
 	"github.com/ctreminiom/go-atlassian/service/mocks"
-	"github.com/stretchr/testify/assert"
-	"net/http"
-	"testing"
 )
 
 func Test_internalWorkspaceServiceImpl_Get(t *testing.T) {
@@ -347,7 +349,7 @@ func Test_internalWorkspaceServiceImpl_Membership(t *testing.T) {
 	type args struct {
 		ctx       context.Context
 		workspace string
-		memberId  string
+		memberID  string
 	}
 
 	testCases := []struct {
@@ -363,7 +365,7 @@ func Test_internalWorkspaceServiceImpl_Membership(t *testing.T) {
 			args: args{
 				ctx:       context.Background(),
 				workspace: "work-space-name-sample",
-				memberId:  "account-id-sample",
+				memberID:  "account-id-sample",
 			},
 			on: func(fields *fields) {
 
@@ -390,7 +392,7 @@ func Test_internalWorkspaceServiceImpl_Membership(t *testing.T) {
 			args: args{
 				ctx:       context.Background(),
 				workspace: "work-space-name-sample",
-				memberId:  "account-id-sample",
+				memberID:  "account-id-sample",
 			},
 			on: func(fields *fields) {
 
@@ -440,7 +442,7 @@ func Test_internalWorkspaceServiceImpl_Membership(t *testing.T) {
 
 			newService := NewWorkspaceService(testCase.fields.c, nil, nil)
 
-			gotResult, gotResponse, err := newService.Membership(testCase.args.ctx, testCase.args.workspace, testCase.args.memberId)
+			gotResult, gotResponse, err := newService.Membership(testCase.args.ctx, testCase.args.workspace, testCase.args.memberID)
 
 			if testCase.wantErr {
 
diff --git a/jira/agile/internal/sprint_impl_test.go b/jira/agile/internal/sprint_impl_test.go
index 0b1504a..94db8e5 100644
--- a/jira/agile/internal/sprint_impl_test.go
+++ b/jira/agile/internal/sprint_impl_test.go
@@ -3,12 +3,14 @@ package internal
 import (
 	"context"
 	"errors"
+	"net/http"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
 	model "github.com/ctreminiom/go-atlassian/pkg/infra/models"
 	"github.com/ctreminiom/go-atlassian/service"
 	"github.com/ctreminiom/go-atlassian/service/mocks"
-	"github.com/stretchr/testify/assert"
-	"net/http"
-	"testing"
 )
 
 func Test_SprintService_Get(t *testing.T) {
@@ -19,7 +21,7 @@ func Test_SprintService_Get(t *testing.T) {
 
 	type args struct {
 		ctx      context.Context
-		sprintId int
+		sprintID int
 	}
 
 	testCases := []struct {
@@ -34,7 +36,7 @@ func Test_SprintService_Get(t *testing.T) {
 			name: "when the parameters are correct",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 10001,
+				sprintID: 10001,
 			},
 			on: func(fields *fields) {
 
@@ -61,7 +63,7 @@ func Test_SprintService_Get(t *testing.T) {
 			name: "when the api cannot be executed",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 10001,
+				sprintID: 10001,
 			},
 			on: func(fields *fields) {
 
@@ -90,7 +92,7 @@ func Test_SprintService_Get(t *testing.T) {
 			name: "when the request cannot be created",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 10001,
+				sprintID: 10001,
 			},
 			on: func(fields *fields) {
 
@@ -114,7 +116,7 @@ func Test_SprintService_Get(t *testing.T) {
 			name: "when the sprint id is not provided",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 0,
+				sprintID: 0,
 			},
 			on: func(fields *fields) {
 				fields.c = mocks.NewConnector(t)
@@ -134,7 +136,7 @@ func Test_SprintService_Get(t *testing.T) {
 
 			sprintService := NewSprintService(testCase.fields.c, "1.0")
 
-			gotResult, gotResponse, err := sprintService.Get(testCase.args.ctx, testCase.args.sprintId)
+			gotResult, gotResponse, err := sprintService.Get(testCase.args.ctx, testCase.args.sprintID)
 
 			if testCase.wantErr {
 
@@ -306,7 +308,7 @@ func Test_SprintService_Update(t *testing.T) {
 
 	type args struct {
 		ctx      context.Context
-		sprintId int
+		sprintID int
 		payload  *model.SprintPayloadScheme
 	}
 
@@ -322,7 +324,7 @@ func Test_SprintService_Update(t *testing.T) {
 			name: "when the parameters are correct",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 				payload:  payloadMocked,
 			},
 			on: func(fields *fields) {
@@ -350,7 +352,7 @@ func Test_SprintService_Update(t *testing.T) {
 			name: "when the api cannot be executed",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 				payload:  payloadMocked,
 			},
 			on: func(fields *fields) {
@@ -380,7 +382,7 @@ func Test_SprintService_Update(t *testing.T) {
 			name: "when the request cannot be created",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 				payload:  payloadMocked,
 			},
 			on: func(fields *fields) {
@@ -411,7 +413,7 @@ func Test_SprintService_Update(t *testing.T) {
 
 			sprintService := NewSprintService(testCase.fields.c, "1.0")
 
-			gotResult, gotResponse, err := sprintService.Update(testCase.args.ctx, testCase.args.sprintId, testCase.args.payload)
+			gotResult, gotResponse, err := sprintService.Update(testCase.args.ctx, testCase.args.sprintID, testCase.args.payload)
 
 			if testCase.wantErr {
 
@@ -447,7 +449,7 @@ func Test_SprintService_Path(t *testing.T) {
 
 	type args struct {
 		ctx      context.Context
-		sprintId int
+		sprintID int
 		payload  *model.SprintPayloadScheme
 	}
 
@@ -463,7 +465,7 @@ func Test_SprintService_Path(t *testing.T) {
 			name: "when the parameters are correct",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 				payload:  payloadMocked,
 			},
 			on: func(fields *fields) {
@@ -491,7 +493,7 @@ func Test_SprintService_Path(t *testing.T) {
 			name: "when the api cannot be executed",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 				payload:  payloadMocked,
 			},
 			on: func(fields *fields) {
@@ -521,7 +523,7 @@ func Test_SprintService_Path(t *testing.T) {
 			name: "when the request cannot be created",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 				payload:  payloadMocked,
 			},
 			on: func(fields *fields) {
@@ -552,7 +554,7 @@ func Test_SprintService_Path(t *testing.T) {
 
 			sprintService := NewSprintService(testCase.fields.c, "1.0")
 
-			gotResult, gotResponse, err := sprintService.Path(testCase.args.ctx, testCase.args.sprintId, testCase.args.payload)
+			gotResult, gotResponse, err := sprintService.Path(testCase.args.ctx, testCase.args.sprintID, testCase.args.payload)
 
 			if testCase.wantErr {
 
@@ -581,7 +583,7 @@ func Test_SprintService_Delete(t *testing.T) {
 
 	type args struct {
 		ctx      context.Context
-		sprintId int
+		sprintID int
 	}
 
 	testCases := []struct {
@@ -596,7 +598,7 @@ func Test_SprintService_Delete(t *testing.T) {
 			name: "when the parameters are correct",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 			},
 			on: func(fields *fields) {
 
@@ -635,7 +637,7 @@ func Test_SprintService_Delete(t *testing.T) {
 			name: "when the api cannot be executed",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 			},
 			on: func(fields *fields) {
 
@@ -664,7 +666,7 @@ func Test_SprintService_Delete(t *testing.T) {
 			name: "when the request cannot be created",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 			},
 			on: func(fields *fields) {
 
@@ -694,7 +696,7 @@ func Test_SprintService_Delete(t *testing.T) {
 
 			sprintService := NewSprintService(testCase.fields.c, "1.0")
 
-			gotResponse, err := sprintService.Delete(testCase.args.ctx, testCase.args.sprintId)
+			gotResponse, err := sprintService.Delete(testCase.args.ctx, testCase.args.sprintID)
 
 			if testCase.wantErr {
 
@@ -722,7 +724,7 @@ func Test_SprintService_Issues(t *testing.T) {
 
 	type args struct {
 		ctx                 context.Context
-		sprintId            int
+		sprintID            int
 		opts                *model.IssueOptionScheme
 		startAt, maxResults int
 	}
@@ -739,7 +741,7 @@ func Test_SprintService_Issues(t *testing.T) {
 			name: "when the parameters are correct",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 10001,
+				sprintID: 10001,
 				opts: &model.IssueOptionScheme{
 					JQL:           "project = ABC",
 					ValidateQuery: true,
@@ -774,7 +776,7 @@ func Test_SprintService_Issues(t *testing.T) {
 			name: "when the api cannot be executed",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 10001,
+				sprintID: 10001,
 				opts: &model.IssueOptionScheme{
 					JQL:           "project = ABC",
 					ValidateQuery: true,
@@ -811,7 +813,7 @@ func Test_SprintService_Issues(t *testing.T) {
 			name: "when the request cannot be created",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 10001,
+				sprintID: 10001,
 				opts: &model.IssueOptionScheme{
 					JQL:           "project = ABC",
 					ValidateQuery: true,
@@ -843,7 +845,7 @@ func Test_SprintService_Issues(t *testing.T) {
 			name: "when the sprint id is not provided",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 0,
+				sprintID: 0,
 			},
 			on: func(fields *fields) {
 				fields.c = mocks.NewConnector(t)
@@ -863,7 +865,7 @@ func Test_SprintService_Issues(t *testing.T) {
 
 			sprintService := NewSprintService(testCase.fields.c, "1.0")
 
-			gotResult, gotResponse, err := sprintService.Issues(testCase.args.ctx, testCase.args.sprintId, testCase.args.opts,
+			gotResult, gotResponse, err := sprintService.Issues(testCase.args.ctx, testCase.args.sprintID, testCase.args.opts,
 				testCase.args.startAt, testCase.args.maxResults)
 
 			if testCase.wantErr {
@@ -892,7 +894,7 @@ func Test_SprintService_Start(t *testing.T) {
 
 	type args struct {
 		ctx      context.Context
-		sprintId int
+		sprintID int
 	}
 
 	testCases := []struct {
@@ -907,7 +909,7 @@ func Test_SprintService_Start(t *testing.T) {
 			name: "when the parameters are correct",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 			},
 			on: func(fields *fields) {
 
@@ -946,7 +948,7 @@ func Test_SprintService_Start(t *testing.T) {
 			name: "when the api cannot be executed",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 			},
 			on: func(fields *fields) {
 
@@ -975,7 +977,7 @@ func Test_SprintService_Start(t *testing.T) {
 			name: "when the request cannot be created",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 			},
 			on: func(fields *fields) {
 
@@ -1005,7 +1007,7 @@ func Test_SprintService_Start(t *testing.T) {
 
 			sprintService := NewSprintService(testCase.fields.c, "1.0")
 
-			gotResponse, err := sprintService.Start(testCase.args.ctx, testCase.args.sprintId)
+			gotResponse, err := sprintService.Start(testCase.args.ctx, testCase.args.sprintID)
 
 			if testCase.wantErr {
 
@@ -1033,7 +1035,7 @@ func Test_SprintService_Close(t *testing.T) {
 
 	type args struct {
 		ctx      context.Context
-		sprintId int
+		sprintID int
 	}
 
 	testCases := []struct {
@@ -1048,7 +1050,7 @@ func Test_SprintService_Close(t *testing.T) {
 			name: "when the parameters are correct",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 			},
 			on: func(fields *fields) {
 
@@ -1087,7 +1089,7 @@ func Test_SprintService_Close(t *testing.T) {
 			name: "when the api cannot be executed",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 			},
 			on: func(fields *fields) {
 
@@ -1116,7 +1118,7 @@ func Test_SprintService_Close(t *testing.T) {
 			name: "when the request cannot be created",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 			},
 			on: func(fields *fields) {
 
@@ -1146,7 +1148,7 @@ func Test_SprintService_Close(t *testing.T) {
 
 			sprintService := NewSprintService(testCase.fields.c, "1.0")
 
-			gotResponse, err := sprintService.Close(testCase.args.ctx, testCase.args.sprintId)
+			gotResponse, err := sprintService.Close(testCase.args.ctx, testCase.args.sprintID)
 
 			if testCase.wantErr {
 
@@ -1172,7 +1174,7 @@ func Test_SprintService_Move(t *testing.T) {
 		Issues:            []string{"DUMMY-1", "DUMMY-2"},
 		RankBeforeIssue:   "DUMMY-4",
 		RankAfterIssue:    "DUMMY-12",
-		RankCustomFieldId: 10521,
+		RankCustomFieldID: 10521,
 	}
 
 	type fields struct {
@@ -1181,7 +1183,7 @@ func Test_SprintService_Move(t *testing.T) {
 
 	type args struct {
 		ctx      context.Context
-		sprintId int
+		sprintID int
 		payload  *model.SprintMovePayloadScheme
 	}
 
@@ -1197,7 +1199,7 @@ func Test_SprintService_Move(t *testing.T) {
 			name: "when the parameters are correct",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 				payload:  payloadMocked,
 			},
 			on: func(fields *fields) {
@@ -1237,7 +1239,7 @@ func Test_SprintService_Move(t *testing.T) {
 			name: "when the api cannot be executed",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 				payload:  payloadMocked,
 			},
 			on: func(fields *fields) {
@@ -1267,7 +1269,7 @@ func Test_SprintService_Move(t *testing.T) {
 			name: "when the request cannot be created",
 			args: args{
 				ctx:      context.Background(),
-				sprintId: 1001,
+				sprintID: 1001,
 				payload:  payloadMocked,
 			},
 			on: func(fields *fields) {
@@ -1298,7 +1300,7 @@ func Test_SprintService_Move(t *testing.T) {
 
 			sprintService := NewSprintService(testCase.fields.c, "1.0")
 
-			gotResponse, err := sprintService.Move(testCase.args.ctx, testCase.args.sprintId, testCase.args.payload)
+			gotResponse, err := sprintService.Move(testCase.args.ctx, testCase.args.sprintID, testCase.args.payload)
 
 			if testCase.wantErr {
 
diff --git a/jira/internal/type_screen_scheme_impl_test.go b/jira/internal/type_screen_scheme_impl_test.go
index 44a9b3f..d1f2eb0 100644
--- a/jira/internal/type_screen_scheme_impl_test.go
+++ b/jira/internal/type_screen_scheme_impl_test.go
@@ -3,12 +3,14 @@ package internal
 import (
 	"context"
 	"errors"
+	"net/http"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+
 	model "github.com/ctreminiom/go-atlassian/pkg/infra/models"
 	"github.com/ctreminiom/go-atlassian/service"
 	"github.com/ctreminiom/go-atlassian/service/mocks"
-	"github.com/stretchr/testify/assert"
-	"net/http"
-	"testing"
 )
 
 func Test_internalTypeScreenSchemeImpl_Gets(t *testing.T) {
@@ -177,7 +179,7 @@ func Test_internalTypeScreenSchemeImpl_Projects(t *testing.T) {
 
 	type args struct {
 		ctx                 context.Context
-		projectIds          []int
+		projectIDs          []int
 		startAt, maxResults int
 	}
 
@@ -194,7 +196,7 @@ func Test_internalTypeScreenSchemeImpl_Projects(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:        context.Background(),
-				projectIds: []int{29992, 349383},
+				projectIDs: []int{29992, 349383},
 				startAt:    50,
 				maxResults: 100,
 			},
@@ -225,7 +227,7 @@ func Test_internalTypeScreenSchemeImpl_Projects(t *testing.T) {
 			fields: fields{version: "2"},
 			args: args{
 				ctx:        context.Background(),
-				projectIds: []int{29992, 349383},
+				projectIDs: []int{29992, 349383},
 				startAt:    50,
 				maxResults: 100,
 			},
@@ -256,7 +258,7 @@ func Test_internalTypeScreenSchemeImpl_Projects(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:        context.Background(),
-				projectIds: []int{29992, 349383},
+				projectIDs: []int{29992, 349383},
 				startAt:    50,
 				maxResults: 100,
 			},
@@ -288,7 +290,7 @@ func Test_internalTypeScreenSchemeImpl_Projects(t *testing.T) {
 			newService, err := NewTypeScreenSchemeService(testCase.fields.c, testCase.fields.version)
 			assert.NoError(t, err)
 
-			gotResult, gotResponse, err := newService.Projects(testCase.args.ctx, testCase.args.projectIds, testCase.args.startAt,
+			gotResult, gotResponse, err := newService.Projects(testCase.args.ctx, testCase.args.projectIDs, testCase.args.startAt,
 				testCase.args.maxResults)
 
 			if testCase.wantErr {
@@ -319,7 +321,7 @@ func Test_internalTypeScreenSchemeImpl_Mapping(t *testing.T) {
 
 	type args struct {
 		ctx                      context.Context
-		issueTypeScreenSchemeIds []int
+		issueTypeScreenSchemeIDs []int
 		startAt, maxResults      int
 	}
 
@@ -336,7 +338,7 @@ func Test_internalTypeScreenSchemeImpl_Mapping(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                      context.Background(),
-				issueTypeScreenSchemeIds: []int{29992, 349383},
+				issueTypeScreenSchemeIDs: []int{29992, 349383},
 				startAt:                  50,
 				maxResults:               100,
 			},
@@ -367,7 +369,7 @@ func Test_internalTypeScreenSchemeImpl_Mapping(t *testing.T) {
 			fields: fields{version: "2"},
 			args: args{
 				ctx:                      context.Background(),
-				issueTypeScreenSchemeIds: []int{29992, 349383},
+				issueTypeScreenSchemeIDs: []int{29992, 349383},
 				startAt:                  50,
 				maxResults:               100,
 			},
@@ -398,7 +400,7 @@ func Test_internalTypeScreenSchemeImpl_Mapping(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                      context.Background(),
-				issueTypeScreenSchemeIds: []int{29992, 349383},
+				issueTypeScreenSchemeIDs: []int{29992, 349383},
 				startAt:                  50,
 				maxResults:               100,
 			},
@@ -430,7 +432,7 @@ func Test_internalTypeScreenSchemeImpl_Mapping(t *testing.T) {
 			newService, err := NewTypeScreenSchemeService(testCase.fields.c, testCase.fields.version)
 			assert.NoError(t, err)
 
-			gotResult, gotResponse, err := newService.Mapping(testCase.args.ctx, testCase.args.issueTypeScreenSchemeIds, testCase.args.startAt,
+			gotResult, gotResponse, err := newService.Mapping(testCase.args.ctx, testCase.args.issueTypeScreenSchemeIDs, testCase.args.startAt,
 				testCase.args.maxResults)
 
 			if testCase.wantErr {
@@ -461,7 +463,7 @@ func Test_internalTypeScreenSchemeImpl_SchemesByProject(t *testing.T) {
 
 	type args struct {
 		ctx                     context.Context
-		issueTypeScreenSchemeId int
+		issueTypeScreenSchemeID int
 		startAt, maxResults     int
 	}
 
@@ -478,7 +480,7 @@ func Test_internalTypeScreenSchemeImpl_SchemesByProject(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: 29992,
+				issueTypeScreenSchemeID: 29992,
 				startAt:                 50,
 				maxResults:              100,
 			},
@@ -509,7 +511,7 @@ func Test_internalTypeScreenSchemeImpl_SchemesByProject(t *testing.T) {
 			fields: fields{version: "2"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: 29992,
+				issueTypeScreenSchemeID: 29992,
 				startAt:                 50,
 				maxResults:              100,
 			},
@@ -540,7 +542,7 @@ func Test_internalTypeScreenSchemeImpl_SchemesByProject(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: 29992,
+				issueTypeScreenSchemeID: 29992,
 				startAt:                 50,
 				maxResults:              100,
 			},
@@ -572,7 +574,7 @@ func Test_internalTypeScreenSchemeImpl_SchemesByProject(t *testing.T) {
 			newService, err := NewTypeScreenSchemeService(testCase.fields.c, testCase.fields.version)
 			assert.NoError(t, err)
 
-			gotResult, gotResponse, err := newService.SchemesByProject(testCase.args.ctx, testCase.args.issueTypeScreenSchemeId, testCase.args.startAt,
+			gotResult, gotResponse, err := newService.SchemesByProject(testCase.args.ctx, testCase.args.issueTypeScreenSchemeID, testCase.args.startAt,
 				testCase.args.maxResults)
 
 			if testCase.wantErr {
@@ -605,7 +607,7 @@ func Test_internalTypeScreenSchemeImpl_Assign(t *testing.T) {
 
 	type args struct {
 		ctx                                context.Context
-		issueTypeScreenSchemeId, projectId string
+		issueTypeScreenSchemeID, projectID string
 	}
 
 	testCases := []struct {
@@ -621,8 +623,8 @@ func Test_internalTypeScreenSchemeImpl_Assign(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
-				projectId:               "848483",
+				issueTypeScreenSchemeID: "20001",
+				projectID:               "848483",
 			},
 			on: func(fields *fields) {
 
@@ -651,8 +653,8 @@ func Test_internalTypeScreenSchemeImpl_Assign(t *testing.T) {
 			fields: fields{version: "2"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
-				projectId:               "848483",
+				issueTypeScreenSchemeID: "20001",
+				projectID:               "848483",
 			},
 			on: func(fields *fields) {
 
@@ -681,7 +683,7 @@ func Test_internalTypeScreenSchemeImpl_Assign(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "",
+				issueTypeScreenSchemeID: "",
 			},
 			wantErr: true,
 			Err:     model.ErrNoIssueTypeScreenSchemeIDError,
@@ -692,7 +694,7 @@ func Test_internalTypeScreenSchemeImpl_Assign(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
+				issueTypeScreenSchemeID: "20001",
 			},
 			wantErr: true,
 			Err:     model.ErrNoProjectIDError,
@@ -703,8 +705,8 @@ func Test_internalTypeScreenSchemeImpl_Assign(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
-				projectId:               "848483",
+				issueTypeScreenSchemeID: "20001",
+				projectID:               "848483",
 			},
 			on: func(fields *fields) {
 
@@ -734,7 +736,7 @@ func Test_internalTypeScreenSchemeImpl_Assign(t *testing.T) {
 			newService, err := NewTypeScreenSchemeService(testCase.fields.c, testCase.fields.version)
 			assert.NoError(t, err)
 
-			gotResponse, err := newService.Assign(testCase.args.ctx, testCase.args.issueTypeScreenSchemeId, testCase.args.projectId)
+			gotResponse, err := newService.Assign(testCase.args.ctx, testCase.args.issueTypeScreenSchemeID, testCase.args.projectID)
 
 			if testCase.wantErr {
 
@@ -765,7 +767,7 @@ func Test_internalTypeScreenSchemeImpl_Update(t *testing.T) {
 
 	type args struct {
 		ctx                                        context.Context
-		issueTypeScreenSchemeId, name, description string
+		issueTypeScreenSchemeID, name, description string
 	}
 
 	testCases := []struct {
@@ -781,7 +783,7 @@ func Test_internalTypeScreenSchemeImpl_Update(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "",
+				issueTypeScreenSchemeID: "",
 			},
 			wantErr: true,
 			Err:     model.ErrNoIssueTypeScreenSchemeIDError,
@@ -791,7 +793,7 @@ func Test_internalTypeScreenSchemeImpl_Update(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
+				issueTypeScreenSchemeID: "20001",
 				name:                    "New issue type scheme name",
 				description:             "New issue type scheme description",
 			},
@@ -822,7 +824,7 @@ func Test_internalTypeScreenSchemeImpl_Update(t *testing.T) {
 			fields: fields{version: "2"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
+				issueTypeScreenSchemeID: "20001",
 				name:                    "New issue type scheme name",
 				description:             "New issue type scheme description",
 			},
@@ -853,7 +855,7 @@ func Test_internalTypeScreenSchemeImpl_Update(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
+				issueTypeScreenSchemeID: "20001",
 				name:                    "New issue type scheme name",
 				description:             "New issue type scheme description",
 			},
@@ -885,7 +887,7 @@ func Test_internalTypeScreenSchemeImpl_Update(t *testing.T) {
 			newService, err := NewTypeScreenSchemeService(testCase.fields.c, testCase.fields.version)
 			assert.NoError(t, err)
 
-			gotResponse, err := newService.Update(testCase.args.ctx, testCase.args.issueTypeScreenSchemeId, testCase.args.name,
+			gotResponse, err := newService.Update(testCase.args.ctx, testCase.args.issueTypeScreenSchemeID, testCase.args.name,
 				testCase.args.description)
 
 			if testCase.wantErr {
@@ -915,7 +917,7 @@ func Test_internalTypeScreenSchemeImpl_Delete(t *testing.T) {
 
 	type args struct {
 		ctx                     context.Context
-		issueTypeScreenSchemeId string
+		issueTypeScreenSchemeID string
 	}
 
 	testCases := []struct {
@@ -931,7 +933,7 @@ func Test_internalTypeScreenSchemeImpl_Delete(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "",
+				issueTypeScreenSchemeID: "",
 			},
 			wantErr: true,
 			Err:     model.ErrNoIssueTypeScreenSchemeIDError,
@@ -941,7 +943,7 @@ func Test_internalTypeScreenSchemeImpl_Delete(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
+				issueTypeScreenSchemeID: "20001",
 			},
 			on: func(fields *fields) {
 
@@ -970,7 +972,7 @@ func Test_internalTypeScreenSchemeImpl_Delete(t *testing.T) {
 			fields: fields{version: "2"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
+				issueTypeScreenSchemeID: "20001",
 			},
 			on: func(fields *fields) {
 
@@ -999,7 +1001,7 @@ func Test_internalTypeScreenSchemeImpl_Delete(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
+				issueTypeScreenSchemeID: "20001",
 			},
 			on: func(fields *fields) {
 
@@ -1029,7 +1031,7 @@ func Test_internalTypeScreenSchemeImpl_Delete(t *testing.T) {
 			newService, err := NewTypeScreenSchemeService(testCase.fields.c, testCase.fields.version)
 			assert.NoError(t, err)
 
-			gotResponse, err := newService.Delete(testCase.args.ctx, testCase.args.issueTypeScreenSchemeId)
+			gotResponse, err := newService.Delete(testCase.args.ctx, testCase.args.issueTypeScreenSchemeID)
 
 			if testCase.wantErr {
 
@@ -1071,7 +1073,7 @@ func Test_internalTypeScreenSchemeImpl_Append(t *testing.T) {
 
 	type args struct {
 		ctx                     context.Context
-		issueTypeScreenSchemeId string
+		issueTypeScreenSchemeID string
 		payload                 *model.IssueTypeScreenSchemePayloadScheme
 	}
 
@@ -1088,7 +1090,7 @@ func Test_internalTypeScreenSchemeImpl_Append(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "",
+				issueTypeScreenSchemeID: "",
 			},
 			wantErr: true,
 			Err:     model.ErrNoIssueTypeScreenSchemeIDError,
@@ -1098,7 +1100,7 @@ func Test_internalTypeScreenSchemeImpl_Append(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
+				issueTypeScreenSchemeID: "20001",
 				payload:                 payloadMocked,
 			},
 			on: func(fields *fields) {
@@ -1128,7 +1130,7 @@ func Test_internalTypeScreenSchemeImpl_Append(t *testing.T) {
 			fields: fields{version: "2"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
+				issueTypeScreenSchemeID: "20001",
 				payload:                 payloadMocked,
 			},
 			on: func(fields *fields) {
@@ -1158,7 +1160,7 @@ func Test_internalTypeScreenSchemeImpl_Append(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
+				issueTypeScreenSchemeID: "20001",
 				payload:                 payloadMocked,
 			},
 			on: func(fields *fields) {
@@ -1189,7 +1191,7 @@ func Test_internalTypeScreenSchemeImpl_Append(t *testing.T) {
 			newService, err := NewTypeScreenSchemeService(testCase.fields.c, testCase.fields.version)
 			assert.NoError(t, err)
 
-			gotResponse, err := newService.Append(testCase.args.ctx, testCase.args.issueTypeScreenSchemeId,
+			gotResponse, err := newService.Append(testCase.args.ctx, testCase.args.issueTypeScreenSchemeID,
 				testCase.args.payload)
 
 			if testCase.wantErr {
@@ -1221,7 +1223,7 @@ func Test_internalTypeScreenSchemeImpl_UpdateDefault(t *testing.T) {
 
 	type args struct {
 		ctx                                     context.Context
-		issueTypeScreenSchemeId, screenSchemeId string
+		issueTypeScreenSchemeID, screenSchemeID string
 	}
 
 	testCases := []struct {
@@ -1237,7 +1239,7 @@ func Test_internalTypeScreenSchemeImpl_UpdateDefault(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "",
+				issueTypeScreenSchemeID: "",
 			},
 			wantErr: true,
 			Err:     model.ErrNoIssueTypeScreenSchemeIDError,
@@ -1247,7 +1249,7 @@ func Test_internalTypeScreenSchemeImpl_UpdateDefault(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
+				issueTypeScreenSchemeID: "20001",
 			},
 			wantErr: true,
 			Err:     model.ErrNoScreenSchemeIDError,
@@ -1257,8 +1259,8 @@ func Test_internalTypeScreenSchemeImpl_UpdateDefault(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
-				screenSchemeId:          "200202",
+				issueTypeScreenSchemeID: "20001",
+				screenSchemeID:          "200202",
 			},
 			on: func(fields *fields) {
 
@@ -1287,8 +1289,8 @@ func Test_internalTypeScreenSchemeImpl_UpdateDefault(t *testing.T) {
 			fields: fields{version: "2"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
-				screenSchemeId:          "200202",
+				issueTypeScreenSchemeID: "20001",
+				screenSchemeID:          "200202",
 			},
 			on: func(fields *fields) {
 
@@ -1317,8 +1319,8 @@ func Test_internalTypeScreenSchemeImpl_UpdateDefault(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
-				screenSchemeId:          "200202",
+				issueTypeScreenSchemeID: "20001",
+				screenSchemeID:          "200202",
 			},
 			on: func(fields *fields) {
 
@@ -1348,8 +1350,8 @@ func Test_internalTypeScreenSchemeImpl_UpdateDefault(t *testing.T) {
 			newService, err := NewTypeScreenSchemeService(testCase.fields.c, testCase.fields.version)
 			assert.NoError(t, err)
 
-			gotResponse, err := newService.UpdateDefault(testCase.args.ctx, testCase.args.issueTypeScreenSchemeId,
-				testCase.args.screenSchemeId)
+			gotResponse, err := newService.UpdateDefault(testCase.args.ctx, testCase.args.issueTypeScreenSchemeID,
+				testCase.args.screenSchemeID)
 
 			if testCase.wantErr {
 
@@ -1380,8 +1382,8 @@ func Test_internalTypeScreenSchemeImpl_Remove(t *testing.T) {
 
 	type args struct {
 		ctx                     context.Context
-		issueTypeScreenSchemeId string
-		issueTypeIds            []string
+		issueTypeScreenSchemeID string
+		issueTypeIDs            []string
 	}
 
 	testCases := []struct {
@@ -1397,7 +1399,7 @@ func Test_internalTypeScreenSchemeImpl_Remove(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "",
+				issueTypeScreenSchemeID: "",
 			},
 			wantErr: true,
 			Err:     model.ErrNoIssueTypeScreenSchemeIDError,
@@ -1407,7 +1409,7 @@ func Test_internalTypeScreenSchemeImpl_Remove(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "2201",
+				issueTypeScreenSchemeID: "2201",
 			},
 			wantErr: true,
 			Err:     model.ErrNoIssueTypesError,
@@ -1417,8 +1419,8 @@ func Test_internalTypeScreenSchemeImpl_Remove(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
-				issueTypeIds:            []string{"9", "43"},
+				issueTypeScreenSchemeID: "20001",
+				issueTypeIDs:            []string{"9", "43"},
 			},
 			on: func(fields *fields) {
 
@@ -1447,8 +1449,8 @@ func Test_internalTypeScreenSchemeImpl_Remove(t *testing.T) {
 			fields: fields{version: "2"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
-				issueTypeIds:            []string{"9", "43"},
+				issueTypeScreenSchemeID: "20001",
+				issueTypeIDs:            []string{"9", "43"},
 			},
 			on: func(fields *fields) {
 
@@ -1477,8 +1479,8 @@ func Test_internalTypeScreenSchemeImpl_Remove(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:                     context.Background(),
-				issueTypeScreenSchemeId: "20001",
-				issueTypeIds:            []string{"9", "43"},
+				issueTypeScreenSchemeID: "20001",
+				issueTypeIDs:            []string{"9", "43"},
 			},
 			on: func(fields *fields) {
 
@@ -1508,8 +1510,8 @@ func Test_internalTypeScreenSchemeImpl_Remove(t *testing.T) {
 			newService, err := NewTypeScreenSchemeService(testCase.fields.c, testCase.fields.version)
 			assert.NoError(t, err)
 
-			gotResponse, err := newService.Remove(testCase.args.ctx, testCase.args.issueTypeScreenSchemeId,
-				testCase.args.issueTypeIds)
+			gotResponse, err := newService.Remove(testCase.args.ctx, testCase.args.issueTypeScreenSchemeID,
+				testCase.args.issueTypeIDs)
 
 			if testCase.wantErr {
 
diff --git a/jira/internal/worklog_impl_rich_text_test.go b/jira/internal/worklog_impl_rich_text_test.go
index 92c9d4b..e3a1666 100644
--- a/jira/internal/worklog_impl_rich_text_test.go
+++ b/jira/internal/worklog_impl_rich_text_test.go
@@ -3,13 +3,15 @@ package internal
 import (
 	"context"
 	"errors"
+	"net/http"
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"github.com/stretchr/testify/mock"
+
 	model "github.com/ctreminiom/go-atlassian/pkg/infra/models"
 	"github.com/ctreminiom/go-atlassian/service"
 	"github.com/ctreminiom/go-atlassian/service/mocks"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/mock"
-	"net/http"
-	"testing"
 )
 
 func Test_internalWorklogRichTextImpl_Gets(t *testing.T) {
@@ -23,7 +25,7 @@ func Test_internalWorklogRichTextImpl_Gets(t *testing.T) {
 
 	type args struct {
 		ctx        context.Context
-		worklogIds []int
+		worklogIDs []int
 		expand     []string
 	}
 
@@ -40,7 +42,7 @@ func Test_internalWorklogRichTextImpl_Gets(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:        context.Background(),
-				worklogIds: []int{1, 2, 3, 4},
+				worklogIDs: []int{1, 2, 3, 4},
 				expand:     []string{"properties"},
 			},
 			on: func(fields *fields) {
@@ -80,7 +82,7 @@ func Test_internalWorklogRichTextImpl_Gets(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:        context.Background(),
-				worklogIds: []int{1, 2, 3, 4},
+				worklogIDs: []int{1, 2, 3, 4},
 				expand:     []string{"properties"},
 			},
 			on: func(fields *fields) {
@@ -111,7 +113,7 @@ func Test_internalWorklogRichTextImpl_Gets(t *testing.T) {
 			newService, err := NewWorklogRichTextService(testCase.fields.c, testCase.fields.version)
 			assert.NoError(t, err)
 
-			gotResult, gotResponse, err := newService.Gets(testCase.args.ctx, testCase.args.worklogIds, testCase.args.expand)
+			gotResult, gotResponse, err := newService.Gets(testCase.args.ctx, testCase.args.worklogIDs, testCase.args.expand)
 
 			if testCase.wantErr {
 
@@ -141,7 +143,7 @@ func Test_internalWorklogRichTextImpl_Get(t *testing.T) {
 
 	type args struct {
 		ctx                     context.Context
-		issueKeyOrId, worklogId string
+		issueKeyOrID, worklogID string
 		expand                  []string
 	}
 
@@ -158,8 +160,8 @@ func Test_internalWorklogRichTextImpl_Get(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:          context.Background(),
-				issueKeyOrId: "DUMMY-5",
-				worklogId:    "493939",
+				issueKeyOrID: "DUMMY-5",
+				worklogID:    "493939",
 				expand:       []string{"properties"},
 			},
 			on: func(fields *fields) {
@@ -189,8 +191,8 @@ func Test_internalWorklogRichTextImpl_Get(t *testing.T) {
 			fields: fields{version: "2"},
 			args: args{
 				ctx:          context.Background(),
-				issueKeyOrId: "DUMMY-5",
-				worklogId:    "493939",
+				issueKeyOrID: "DUMMY-5",
+				worklogID:    "493939",
 				expand:       []string{"properties"},
 			},
 			on: func(fields *fields) {
@@ -230,7 +232,7 @@ func Test_internalWorklogRichTextImpl_Get(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:          context.Background(),
-				issueKeyOrId: "DUMMY-5",
+				issueKeyOrID: "DUMMY-5",
 			},
 			wantErr: true,
 			Err:     model.ErrNoWorklogIDError,
@@ -241,8 +243,8 @@ func Test_internalWorklogRichTextImpl_Get(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:          context.Background(),
-				issueKeyOrId: "DUMMY-5",
-				worklogId:    "493939",
+				issueKeyOrID: "DUMMY-5",
+				worklogID:    "493939",
 				expand:       []string{"properties"},
 			},
 			on: func(fields *fields) {
@@ -273,7 +275,7 @@ func Test_internalWorklogRichTextImpl_Get(t *testing.T) {
 			newService, err := NewWorklogRichTextService(testCase.fields.c, testCase.fields.version)
 			assert.NoError(t, err)
 
-			gotResult, gotResponse, err := newService.Get(testCase.args.ctx, testCase.args.issueKeyOrId, testCase.args.worklogId, testCase.args.expand)
+			gotResult, gotResponse, err := newService.Get(testCase.args.ctx, testCase.args.issueKeyOrID, testCase.args.worklogID, testCase.args.expand)
 
 			if testCase.wantErr {
 
@@ -303,7 +305,7 @@ func Test_internalWorklogRichTextImpl_Issue(t *testing.T) {
 
 	type args struct {
 		ctx                        context.Context
-		issueKeyOrId               string
+		issueKeyOrID               string
 		startAt, maxResults, after int
 		expand                     []string
 	}
@@ -321,7 +323,7 @@ func Test_internalWorklogRichTextImpl_Issue(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:          context.Background(),
-				issueKeyOrId: "DUMMY-5",
+				issueKeyOrID: "DUMMY-5",
 				startAt:      0,
 				maxResults:   50,
 				after:        1661101991,
@@ -354,7 +356,7 @@ func Test_internalWorklogRichTextImpl_Issue(t *testing.T) {
 			fields: fields{version: "2"},
 			args: args{
 				ctx:          context.Background(),
-				issueKeyOrId: "DUMMY-5",
+				issueKeyOrID: "DUMMY-5",
 				startAt:      0,
 				maxResults:   50,
 				after:        1661101991,
@@ -397,7 +399,7 @@ func Test_internalWorklogRichTextImpl_Issue(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:          context.Background(),
-				issueKeyOrId: "DUMMY-5",
+				issueKeyOrID: "DUMMY-5",
 				startAt:      0,
 				maxResults:   50,
 				after:        1661101991,
@@ -431,7 +433,7 @@ func Test_internalWorklogRichTextImpl_Issue(t *testing.T) {
 			newService, err := NewWorklogRichTextService(testCase.fields.c, testCase.fields.version)
 			assert.NoError(t, err)
 
-			gotResult, gotResponse, err := newService.Issue(testCase.args.ctx, testCase.args.issueKeyOrId, testCase.args.startAt,
+			gotResult, gotResponse, err := newService.Issue(testCase.args.ctx, testCase.args.issueKeyOrID, testCase.args.startAt,
 				testCase.args.maxResults, testCase.args.after, testCase.args.expand)
 
 			if testCase.wantErr {
@@ -462,7 +464,7 @@ func Test_internalWorklogRichTextImpl_Delete(t *testing.T) {
 
 	type args struct {
 		ctx                     context.Context
-		issueKeyOrId, worklogId string
+		issueKeyOrID, worklogID string
 		options                 *model.WorklogOptionsScheme
 	}
 
@@ -479,8 +481,8 @@ func Test_internalWorklogRichTextImpl_Delete(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:          context.Background(),
-				issueKeyOrId: "DUMMY-5",
-				worklogId:    "h837372",
+				issueKeyOrID: "DUMMY-5",
+				worklogID:    "h837372",
 				options: &model.WorklogOptionsScheme{
 					Notify:               true,
 					AdjustEstimate:       "new",
@@ -517,8 +519,8 @@ func Test_internalWorklogRichTextImpl_Delete(t *testing.T) {
 			fields: fields{version: "2"},
 			args: args{
 				ctx:          context.Background(),
-				issueKeyOrId: "DUMMY-5",
-				worklogId:    "h837372",
+				issueKeyOrID: "DUMMY-5",
+				worklogID:    "h837372",
 				options: &model.WorklogOptionsScheme{
 					Notify:               true,
 					AdjustEstimate:       "new",
@@ -555,8 +557,8 @@ func Test_internalWorklogRichTextImpl_Delete(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:          context.Background(),
-				issueKeyOrId: "DUMMY-5",
-				worklogId:    "h837372",
+				issueKeyOrID: "DUMMY-5",
+				worklogID:    "h837372",
 			},
 			on: func(fields *fields) {
 
@@ -595,7 +597,7 @@ func Test_internalWorklogRichTextImpl_Delete(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:          context.Background(),
-				issueKeyOrId: "DUMMY-5",
+				issueKeyOrID: "DUMMY-5",
 			},
 			wantErr: true,
 			Err:     model.ErrNoWorklogIDError,
@@ -606,8 +608,8 @@ func Test_internalWorklogRichTextImpl_Delete(t *testing.T) {
 			fields: fields{version: "3"},
 			args: args{
 				ctx:          context.Background(),
-				issueKeyOrId: "DUMMY-5",
-				worklogId:    "h837372",
+				issueKeyOrID: "DUMMY-5",
+				worklogID:    "h837372",
 			},
 			on: func(fields *fields) {
 
@@ -637,7 +639,7 @@ func Test_internalWorklogRichTextImpl_Delete(t *testing.T) {
 			newService, err := NewWorklogRichTextService(testCase.fields.c, testCase.fields.version)
 			assert.NoError(t, err)
 
-			gotResponse, err := newService.Delete(testCase.args.ctx, testCase.args.issueKeyOrId, testCase.args.worklogId,
+			gotResponse, err := newService.Delete(testCase.args.ctx, testCase.args.issueKeyOrID, testCase.args.worklogID,
 				testCase.args.options)
 
 			if testCase.wantErr {
@@ -1127,7 +1129,7 @@ func Test_internalWorklogRichTextImpl_Update(t *testing.T) {
 
 	type args struct {
 		ctx                     context.Context
-		issueKeyOrID, worklogId string
+		issueKeyOrID, worklogID string
 		payload                 *model.WorklogRichTextPayloadScheme
 		options                 *model.WorklogOptionsScheme
 	}
@@ -1146,7 +1148,7 @@ func Test_internalWorklogRichTextImpl_Update(t *testing.T) {
 			args: args{
 				ctx:          context.Background(),
 				issueKeyOrID: "DUMMY-5",
-				worklogId:    "3933828822",
+				worklogID:    "3933828822",
 				payload:      payloadMocked,
 				options: &model.WorklogOptionsScheme{
 					Notify:               true,
@@ -1185,7 +1187,7 @@ func Test_internalWorklogRichTextImpl_Update(t *testing.T) {
 			args: args{
 				ctx:          context.Background(),
 				issueKeyOrID: "DUMMY-5",
-				worklogId:    "3933828822",
+				worklogID:    "3933828822",
 				payload:      payloadMocked,
 				options: &model.WorklogOptionsScheme{
 					Notify:               true,
@@ -1245,7 +1247,7 @@ func Test_internalWorklogRichTextImpl_Update(t *testing.T) {
 			args: args{
 				ctx:          context.Background(),
 				issueKeyOrID: "DUMMY-5",
-				worklogId:    "3933828822",
+				worklogID:    "3933828822",
 				payload:      payloadMocked,
 				options: &model.WorklogOptionsScheme{
 					Notify:               true,
@@ -1284,7 +1286,7 @@ func Test_internalWorklogRichTextImpl_Update(t *testing.T) {
 			newService, err := NewWorklogRichTextService(testCase.fields.c, testCase.fields.version)
 			assert.NoError(t, err)
 
-			gotResult, gotResponse, err := newService.Update(testCase.args.ctx, testCase.args.issueKeyOrID, testCase.args.worklogId,
+			gotResult, gotResponse, err := newService.Update(testCase.args.ctx, testCase.args.issueKeyOrID, testCase.args.worklogID,
 				testCase.args.payload, testCase.args.options)
 
 			if testCase.wantErr {