Repository: ctreminiom/go-atlassian
Pull request #293 (2024-07-20 13:28:21)

Fixed code scanning issues


Patch:
diff --git a/bitbucket/api_client_impl.go b/bitbucket/api_client_impl.go
index 8ee72c7..5f9d94b 100644
--- a/bitbucket/api_client_impl.go
+++ b/bitbucket/api_client_impl.go
@@ -5,17 +5,20 @@ import (
 	"context"
 	"encoding/json"
 	"fmt"
-	"github.com/ctreminiom/go-atlassian/bitbucket/internal"
-	"github.com/ctreminiom/go-atlassian/pkg/infra/models"
-	"github.com/ctreminiom/go-atlassian/service/common"
 	"io"
 	"net/http"
 	"net/url"
 	"strings"
+
+	"github.com/ctreminiom/go-atlassian/bitbucket/internal"
+	"github.com/ctreminiom/go-atlassian/pkg/infra/models"
+	"github.com/ctreminiom/go-atlassian/service/common"
 )
 
+// DefaultBitbucketSite is the default Bitbucket API site.
 const DefaultBitbucketSite = "https://api.bitbucket.org"
 
+// New creates a new Bitbucket API client.
 func New(httpClient common.HttpClient, site string) (*Client, error) {
 
 	if httpClient == nil {
@@ -50,6 +53,7 @@ func New(httpClient common.HttpClient, site string) (*Client, error) {
 	return client, nil
 }
 
+// Client is a Bitbucket API client.
 type Client struct {
 	HTTP      common.HttpClient
 	Site      *url.URL
@@ -57,6 +61,7 @@ type Client struct {
 	Workspace *internal.WorkspaceService
 }
 
+// NewRequest creates an API request.
 func (c *Client) NewRequest(ctx context.Context, method, urlStr, type_ string, body interface{}) (*http.Request, error) {
 
 	rel, err := url.Parse(urlStr)
@@ -111,6 +116,7 @@ func (c *Client) NewRequest(ctx context.Context, method, urlStr, type_ string, b
 	return req, nil
 }
 
+// Call executes an API request and returns the response.
 func (c *Client) Call(request *http.Request, structure interface{}) (*models.ResponseScheme, error) {
 
 	response, err := c.HTTP.Do(request)
diff --git a/bitbucket/internal/workspace_webhooks_impl.go b/bitbucket/internal/workspace_webhooks_impl.go
index 8c0fd80..bb9b043 100644
--- a/bitbucket/internal/workspace_webhooks_impl.go
+++ b/bitbucket/internal/workspace_webhooks_impl.go
@@ -3,19 +3,21 @@ 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"
 )
 
+// NewWorkspaceHookService creates a new WorkspaceHookService.
 func NewWorkspaceHookService(client service.Connector) *WorkspaceHookService {
-
 	return &WorkspaceHookService{
 		internalClient: &internalWorkspaceHookServiceImpl{c: client},
 	}
 }
 
+// WorkspaceHookService handles communication with the workspace hook related methods of the Bitbucket API.
 type WorkspaceHookService struct {
 	internalClient bitbucket.WorkspaceHookConnector
 }
@@ -45,8 +47,8 @@ func (w *WorkspaceHookService) Create(ctx context.Context, workspace string, pay
 // GET /2.0/workspaces/{workspace}/hooks/{uid}
 //
 // https://docs.go-atlassian.io/bitbucket-cloud/workspace/webhooks#get-webhook-for-a-workspace
-func (w *WorkspaceHookService) Get(ctx context.Context, workspace, webhookId string) (*model.WebhookSubscriptionScheme, *model.ResponseScheme, error) {
-	return w.internalClient.Get(ctx, workspace, webhookId)
+func (w *WorkspaceHookService) Get(ctx context.Context, workspace, webhookID string) (*model.WebhookSubscriptionScheme, *model.ResponseScheme, error) {
+	return w.internalClient.Get(ctx, workspace, webhookID)
 }
 
 // Update updates the specified webhook subscription.
@@ -54,8 +56,8 @@ func (w *WorkspaceHookService) Get(ctx context.Context, workspace, webhookId str
 // PUT /2.0/workspaces/{workspace}/hooks/{uid}
 //
 // https://docs.go-atlassian.io/bitbucket-cloud/workspace/webhooks#update-webhook-for-a-workspace
-func (w *WorkspaceHookService) Update(ctx context.Context, workspace, webhookId string, payload *model.WebhookSubscriptionPayloadScheme) (*model.WebhookSubscriptionScheme, *model.ResponseScheme, error) {
-	return w.internalClient.Update(ctx, workspace, webhookId, payload)
+func (w *WorkspaceHookService) Update(ctx context.Context, workspace, webhookID string, payload *model.WebhookSubscriptionPayloadScheme) (*model.WebhookSubscriptionScheme, *model.ResponseScheme, error) {
+	return w.internalClient.Update(ctx, workspace, webhookID, payload)
 }
 
 // Delete deletes the specified webhook subscription from the given workspace.
@@ -63,8 +65,8 @@ func (w *WorkspaceHookService) Update(ctx context.Context, workspace, webhookId
 // DELETE /2.0/workspaces/{workspace}/hooks/{uid}
 //
 // https://docs.go-atlassian.io/bitbucket-cloud/workspace/webhooks#delete-webhook-for-a-workspace
-func (w *WorkspaceHookService) Delete(ctx context.Context, workspace, webhookId string) (*model.ResponseScheme, error) {
-	return w.internalClient.Delete(ctx, workspace, webhookId)
+func (w *WorkspaceHookService) Delete(ctx context.Context, workspace, webhookID string) (*model.ResponseScheme, error) {
+	return w.internalClient.Delete(ctx, workspace, webhookID)
 }
 
 type internalWorkspaceHookServiceImpl struct {
@@ -115,17 +117,17 @@ func (i *internalWorkspaceHookServiceImpl) Create(ctx context.Context, workspace
 	return webhook, response, nil
 }
 
-func (i *internalWorkspaceHookServiceImpl) Get(ctx context.Context, workspace, webhookId string) (*model.WebhookSubscriptionScheme, *model.ResponseScheme, error) {
+func (i *internalWorkspaceHookServiceImpl) Get(ctx context.Context, workspace, webhookID string) (*model.WebhookSubscriptionScheme, *model.ResponseScheme, error) {
 
 	if workspace == "" {
 		return nil, nil, model.ErrNoWorkspaceError
 	}
 
-	if webhookId == "" {
+	if webhookID == "" {
 		return nil, nil, model.ErrNoWebhookIDError
 	}
 
-	endpoint := fmt.Sprintf("2.0/workspaces/%v/hooks/%v", workspace, webhookId)
+	endpoint := fmt.Sprintf("2.0/workspaces/%v/hooks/%v", workspace, webhookID)
 
 	request, err := i.c.NewRequest(ctx, http.MethodGet, endpoint, "", nil)
 	if err != nil {
@@ -141,17 +143,17 @@ func (i *internalWorkspaceHookServiceImpl) Get(ctx context.Context, workspace, w
 	return webhook, response, nil
 }
 
-func (i *internalWorkspaceHookServiceImpl) Update(ctx context.Context, workspace, webhookId string, payload *model.WebhookSubscriptionPayloadScheme) (*model.WebhookSubscriptionScheme, *model.ResponseScheme, error) {
+func (i *internalWorkspaceHookServiceImpl) Update(ctx context.Context, workspace, webhookID string, payload *model.WebhookSubscriptionPayloadScheme) (*model.WebhookSubscriptionScheme, *model.ResponseScheme, error) {
 
 	if workspace == "" {
 		return nil, nil, model.ErrNoWorkspaceError
 	}
 
-	if webhookId == "" {
+	if webhookID == "" {
 		return nil, nil, model.ErrNoWebhookIDError
 	}
 
-	endpoint := fmt.Sprintf("2.0/workspaces/%v/hooks/%v", workspace, webhookId)
+	endpoint := fmt.Sprintf("2.0/workspaces/%v/hooks/%v", workspace, webhookID)
 
 	request, err := i.c.NewRequest(ctx, http.MethodPut, endpoint, "", payload)
 	if err != nil {
@@ -167,17 +169,17 @@ func (i *internalWorkspaceHookServiceImpl) Update(ctx context.Context, workspace
 	return webhook, response, nil
 }
 
-func (i *internalWorkspaceHookServiceImpl) Delete(ctx context.Context, workspace, webhookId string) (*model.ResponseScheme, error) {
+func (i *internalWorkspaceHookServiceImpl) Delete(ctx context.Context, workspace, webhookID string) (*model.ResponseScheme, error) {
 
 	if workspace == "" {
 		return nil, model.ErrNoWorkspaceError
 	}
 
-	if webhookId == "" {
+	if webhookID == "" {
 		return nil, model.ErrNoWebhookIDError
 	}
 
-	endpoint := fmt.Sprintf("2.0/workspaces/%v/hooks/%v", workspace, webhookId)
+	endpoint := fmt.Sprintf("2.0/workspaces/%v/hooks/%v", workspace, webhookID)
 
 	request, err := i.c.NewRequest(ctx, http.MethodDelete, endpoint, "", nil)
 	if err != nil {
diff --git a/jira/internal/issue_property_impl.go b/jira/internal/issue_property_impl.go
index 5b24eb1..7a3ebfc 100644
--- a/jira/internal/issue_property_impl.go
+++ b/jira/internal/issue_property_impl.go
@@ -10,6 +10,7 @@ import (
 	"github.com/ctreminiom/go-atlassian/service/jira"
 )
 
+// NewIssuePropertyService creates a new instance of the IssuePropertyService.
 func NewIssuePropertyService(client service.Connector, version string) (*IssuePropertyService, error) {
 
 	if version == "" {
@@ -21,6 +22,7 @@ func NewIssuePropertyService(client service.Connector, version string) (*IssuePr
 	}, nil
 }
 
+// IssuePropertyService handles the issue property methods for the Jira Cloud REST API.
 type IssuePropertyService struct {
 	internalClient jira.IssuePropertyConnector
 }
diff --git a/pkg/infra/models/assets_object.go b/pkg/infra/models/assets_object.go
index 3985a39..924b3e0 100644
--- a/pkg/infra/models/assets_object.go
+++ b/pkg/infra/models/assets_object.go
@@ -55,7 +55,7 @@ type ObjectHistoryScheme struct {
 }
 
 // ObjectHistoryActorScheme represents the actor who made a change in the object history.
-// AvatarUrl is the URL of the actor's avatar.
+// AvatarURL is the URL of the actor's avatar.
 // DisplayName is the display name of the actor.
 // Name is the name of the actor.
 // Key is the key of the actor.
@@ -66,7 +66,7 @@ type ObjectHistoryScheme struct {
 // LastSeenVersion is the last seen version of the actor.
 // Self is the self URL of the actor.
 type ObjectHistoryActorScheme struct {
-	AvatarUrl       string `json:"avatarUrl,omitempty"`       // The URL of the actor's avatar.
+	AvatarURL       string `json:"avatarUrl,omitempty"`       // The URL of the actor's avatar.
 	DisplayName     string `json:"displayName,omitempty"`     // The display name of the actor.
 	Name            string `json:"name,omitempty"`            // The name of the actor.
 	Key             string `json:"key,omitempty"`             // The key of the actor.
@@ -139,22 +139,22 @@ type ObjectScheme struct {
 // GlobalID is the global ID of the avatar.
 // ID is the unique identifier of the avatar.
 // AvatarUUID is the UUID of the avatar.
-// Url16 is the URL for the 16x16 version of the avatar.
-// Url48 is the URL for the 48x48 version of the avatar.
-// Url72 is the URL for the 72x72 version of the avatar.
-// Url144 is the URL for the 144x144 version of the avatar.
-// Url288 is the URL for the 288x288 version of the avatar.
+// URL16 is the URL for the 16x16 version of the avatar.
+// URL48 is the URL for the 48x48 version of the avatar.
+// URL72 is the URL for the 72x72 version of the avatar.
+// URL144 is the URL for the 144x144 version of the avatar.
+// URL288 is the URL for the 288x288 version of the avatar.
 // ObjectID is the ID of the object.
 type ObjectAvatarScheme struct {
 	WorkspaceID string `json:"workspaceId,omitempty"` // The ID of the workspace.
 	GlobalID    string `json:"globalId,omitempty"`    // The global ID of the avatar.
 	ID          string `json:"id,omitempty"`          // The ID of the avatar.
 	AvatarUUID  string `json:"avatarUUID,omitempty"`  // The UUID of the avatar.
-	Url16       string `json:"url16,omitempty"`       // The URL for the 16x16 version of the avatar.
-	Url48       string `json:"url48,omitempty"`       // The URL for the 48x48 version of the avatar.
-	Url72       string `json:"url72,omitempty"`       // The URL for the 72x72 version of the avatar.
-	Url144      string `json:"url144,omitempty"`      // The URL for the 144x144 version of the avatar.
-	Url288      string `json:"url288,omitempty"`      // The URL for the 288x288 version of the avatar.
+	URL16       string `json:"url16,omitempty"`       // The URL for the 16x16 version of the avatar.
+	URL48       string `json:"url48,omitempty"`       // The URL for the 48x48 version of the avatar.
+	URL72       string `json:"url72,omitempty"`       // The URL for the 72x72 version of the avatar.
+	URL144      string `json:"url144,omitempty"`      // The URL for the 144x144 version of the avatar.
+	URL288      string `json:"url288,omitempty"`      // The URL for the 288x288 version of the avatar.
 	ObjectID    string `json:"objectId,omitempty"`    // The ID of the object.
 }
 
diff --git a/pkg/infra/models/assets_object_type.go b/pkg/infra/models/assets_object_type.go
index 3b0fec1..91499a9 100644
--- a/pkg/infra/models/assets_object_type.go
+++ b/pkg/infra/models/assets_object_type.go
@@ -20,7 +20,7 @@ type ObjectTypePositionPayloadScheme struct {
 // Updated is the update time of the object type.
 // ObjectCount is the number of objects of the object type.
 // ParentObjectTypeID is the ID of the parent object type.
-// ObjectSchemaId is the ID of the object schema.
+// ObjectSchemaID is the ID of the object schema.
 // Inherited indicates if the object type is inherited.
 // AbstractObjectType indicates if the object type is abstract.
 // ParentObjectTypeInherited indicates if the parent object type is inherited.
@@ -36,7 +36,7 @@ type ObjectTypeScheme struct {
 	Updated                   string      `json:"updated,omitempty"`                   // The update time of the object type.
 	ObjectCount               int         `json:"objectCount,omitempty"`               // The number of objects of the object type.
 	ParentObjectTypeID        string      `json:"parentObjectTypeId,omitempty"`        // The ID of the parent object type.
-	ObjectSchemaId            string      `json:"objectSchemaId,omitempty"`            // The ID of the object schema.
+	ObjectSchemaID            string      `json:"objectSchemaId,omitempty"`            // The ID of the object schema.
 	Inherited                 bool        `json:"inherited,omitempty"`                 // Indicates if the object type is inherited.
 	AbstractObjectType        bool        `json:"abstractObjectType,omitempty"`        // Indicates if the object type is abstract.
 	ParentObjectTypeInherited bool        `json:"parentObjectTypeInherited,omitempty"` // Indicates if the parent object type is inherited.
@@ -45,7 +45,7 @@ type ObjectTypeScheme struct {
 // ObjectTypePayloadScheme represents the payload for an object type.
 // Name is the name of the object type.
 // Description is the description of the object type.
-// IconId is the ID of the icon of the object type.
+// IconID is the ID of the icon of the object type.
 // ObjectSchemaID is the ID of the object schema.
 // ParentObjectTypeID is the ID of the parent object type.
 // Inherited indicates if the object type is inherited.
@@ -53,7 +53,7 @@ type ObjectTypeScheme struct {
 type ObjectTypePayloadScheme struct {
 	Name               string `json:"name,omitempty"`               // The name of the object type.
 	Description        string `json:"description,omitempty"`        // The description of the object type.
-	IconId             string `json:"iconId,omitempty"`             // The ID of the icon of the object type.
+	IconID             string `json:"iconId,omitempty"`             // The ID of the icon of the object type.
 	ObjectSchemaID     string `json:"objectSchemaId,omitempty"`     // The ID of the object schema.
 	ParentObjectTypeID string `json:"parentObjectTypeId,omitempty"` // The ID of the parent object type.
 	Inherited          bool   `json:"inherited,omitempty"`          // Indicates if the object type is inherited.
diff --git a/pkg/infra/models/assets_ticket.go b/pkg/infra/models/assets_ticket.go
index 8fe3a12..f512ea4 100644
--- a/pkg/infra/models/assets_ticket.go
+++ b/pkg/infra/models/assets_ticket.go
@@ -36,17 +36,17 @@ type TicketStatusScheme struct {
 // TicketTypeScheme represents the type of a ticket.
 // Name is the name of the type.
 // Description is the description of the type.
-// IconUrl is the URL of the icon associated with the type.
+// IconURL is the URL of the icon associated with the type.
 type TicketTypeScheme struct {
 	Name        string `json:"name,omitempty"`        // The name of the type.
 	Description string `json:"description,omitempty"` // The description of the type.
-	IconUrl     string `json:"iconUrl,omitempty"`     // The URL of the icon associated with the type.
+	IconURL     string `json:"iconUrl,omitempty"`     // The URL of the icon associated with the type.
 }
 
 // TicketPriorityScheme represents the priority of a ticket.
 // Name is the name of the priority.
-// IconUrl is the URL of the icon associated with the priority.
+// IconURL is the URL of the icon associated with the priority.
 type TicketPriorityScheme struct {
 	Name    string `json:"name,omitempty"`    // The name of the priority.
-	IconUrl string `json:"iconUrl,omitempty"` // The URL of the icon associated with the priority.
+	IconURL string `json:"iconUrl,omitempty"` // The URL of the icon associated with the priority.
 }
diff --git a/pkg/infra/models/confluence_space_v2.go b/pkg/infra/models/confluence_space_v2.go
index 1842869..1231a62 100644
--- a/pkg/infra/models/confluence_space_v2.go
+++ b/pkg/infra/models/confluence_space_v2.go
@@ -32,7 +32,7 @@ type SpaceSchemeV2 struct {
 	Name        string                    `json:"name,omitempty"`        // The name of the space.
 	Type        string                    `json:"type,omitempty"`        // The type of the space.
 	Status      string                    `json:"status,omitempty"`      // The status of the space.
-	HomepageId  string                    `json:"homepageId,omitempty"`  // The ID of the home page of the space.
+	HomepageID  string                    `json:"homepageId,omitempty"`  // The ID of the home page of the space.
 	Description *SpaceDescriptionSchemeV2 `json:"description,omitempty"` // The description of the space.
 }
 
diff --git a/pkg/infra/models/jira_announcement_banner.go b/pkg/infra/models/jira_announcement_banner.go
index 3034c9b..768ce92 100644
--- a/pkg/infra/models/jira_announcement_banner.go
+++ b/pkg/infra/models/jira_announcement_banner.go
@@ -2,7 +2,7 @@ package models
 
 // AnnouncementBannerScheme represents an announcement banner in Jira.
 type AnnouncementBannerScheme struct {
-	HashId        string `json:"hashId,omitempty"`        // The hash ID of the banner.
+	HashID        string `json:"hashId,omitempty"`        // The hash ID of the banner.
 	IsDismissible bool   `json:"isDismissible,omitempty"` // Indicates if the banner is dismissible.
 	IsEnabled     bool   `json:"isEnabled,omitempty"`     // Indicates if the banner is enabled.
 	Message       string `json:"message,omitempty"`       // The message of the banner.
diff --git a/pkg/infra/models/jira_teams.go b/pkg/infra/models/jira_teams.go
index 2bd7efb..bd6b0a1 100644
--- a/pkg/infra/models/jira_teams.go
+++ b/pkg/infra/models/jira_teams.go
@@ -45,7 +45,7 @@ type JiraTeamCreatePayloadScheme struct {
 
 // JiraTeamCreateResponseScheme represents the response from creating a Jira team.
 type JiraTeamCreateResponseScheme struct {
-	Id      int                     `json:"id,omitempty"`      // The ID of the created team.
+	ID      int                     `json:"id,omitempty"`      // The ID of the created team.
 	Team    *JiraTeamScheme         `json:"team,omitempty"`    // The created team.
 	Persons []*JiraTeamPersonScheme `json:"persons,omitempty"` // The persons associated with the created team.
 }
diff --git a/pkg/infra/models/sm_request_type.go b/pkg/infra/models/sm_request_type.go
index 8d57dda..c072b4c 100644
--- a/pkg/infra/models/sm_request_type.go
+++ b/pkg/infra/models/sm_request_type.go
@@ -63,7 +63,7 @@ type RequestTypeLinksScheme struct {
 type RequestTypePayloadScheme struct {
 	Description string `json:"description,omitempty"` // The description of the request type payload.
 	HelpText    string `json:"helpText,omitempty"`    // The help text of the request type payload.
-	IssueTypeId string `json:"issueTypeId,omitempty"` // The issue type ID of the request type payload.
+	IssueTypeID string `json:"issueTypeId,omitempty"` // The issue type ID of the request type payload.
 	Name        string `json:"name,omitempty"`        // The name of the request type payload.
 }
 
diff --git a/service/bitbucket/repository.go b/service/bitbucket/repository.go
index 2832a59..2b77ac8 100644
--- a/service/bitbucket/repository.go
+++ b/service/bitbucket/repository.go
@@ -2,6 +2,7 @@ package bitbucket
 
 import (
 	"context"
+
 	"github.com/ctreminiom/go-atlassian/pkg/infra/models"
 )
 
@@ -42,11 +43,13 @@ type RepositoryConnector interface {
 	Watchers(ctx context.Context, workspace, repoSlug string)
 }
 
+// RepositoryForkConnector represents the Bitbucket Cloud repository forks.
 type RepositoryForkConnector interface {
 	Gets(ctx context.Context)
 	Execute(ctx context.Context)
 }
 
+// RepositoryWebhookConnector represents the Bitbucket Cloud repository webhooks.
 type RepositoryWebhookConnector interface {
 	Gets(ctx context.Context)
 	Get(ctx context.Context)
@@ -55,11 +58,13 @@ type RepositoryWebhookConnector interface {
 	Delete(ctx context.Context)
 }
 
+// RepositorySettingConnector represents the Bitbucket Cloud repository settings.
 type RepositorySettingConnector interface {
 	Gets(ctx context.Context)
 	Set(ctx context.Context)
 }
 
+// RepositoryGroupPermissionConnector represents the Bitbucket Cloud repository group permissions.
 type RepositoryGroupPermissionConnector interface {
 	Gets(ctx context.Context)
 	Get(ctx context.Context)
@@ -67,6 +72,7 @@ type RepositoryGroupPermissionConnector interface {
 	Delete(ctx context.Context)
 }
 
+// RepositoryUserPermissionConnector represents the Bitbucket Cloud repository user permissions.
 type RepositoryUserPermissionConnector interface {
 	Gets(ctx context.Context)
 	Get(ctx context.Context)
diff --git a/service/bitbucket/workspace.go b/service/bitbucket/workspace.go
index 6f46387..6ffa130 100644
--- a/service/bitbucket/workspace.go
+++ b/service/bitbucket/workspace.go
@@ -2,6 +2,7 @@ package bitbucket
 
 import (
 	"context"
+
 	"github.com/ctreminiom/go-atlassian/pkg/infra/models"
 )
 
@@ -33,7 +34,7 @@ type WorkspaceConnector interface {
 	// GET /2.0/workspaces/{workspace}/members/{member}
 	//
 	// https://docs.go-atlassian.io/bitbucket-cloud/workspace#get-member-in-a-workspace
-	Membership(ctx context.Context, workspace, memberId string) (*models.WorkspaceMembershipScheme, *models.ResponseScheme, error)
+	Membership(ctx context.Context, workspace, memberID string) (*models.WorkspaceMembershipScheme, *models.ResponseScheme, error)
 
 	// Projects returns the list of projects in this workspace.
 	//
@@ -69,21 +70,21 @@ type WorkspaceHookConnector interface {
 	// GET /2.0/workspaces/{workspace}/hooks/{uid}
 	//
 	// https://docs.go-atlassian.io/bitbucket-cloud/workspace/webhooks#get-webhook-for-a-workspace
-	Get(ctx context.Context, workspace, webhookId string) (*models.WebhookSubscriptionScheme, *models.ResponseScheme, error)
+	Get(ctx context.Context, workspace, webhookID string) (*models.WebhookSubscriptionScheme, *models.ResponseScheme, error)
 
 	// Update updates the specified webhook subscription.
 	//
 	// PUT /2.0/workspaces/{workspace}/hooks/{uid}
 	//
 	// https://docs.go-atlassian.io/bitbucket-cloud/workspace/webhooks#update-webhook-for-a-workspace
-	Update(ctx context.Context, workspace, webhookId string, payload *models.WebhookSubscriptionPayloadScheme) (*models.WebhookSubscriptionScheme, *models.ResponseScheme, error)
+	Update(ctx context.Context, workspace, webhookID string, payload *models.WebhookSubscriptionPayloadScheme) (*models.WebhookSubscriptionScheme, *models.ResponseScheme, error)
 
 	// Delete deletes the specified webhook subscription from the given workspace.
 	//
 	// DELETE /2.0/workspaces/{workspace}/hooks/{uid}
 	//
 	// https://docs.go-atlassian.io/bitbucket-cloud/workspace/webhooks#delete-webhook-for-a-workspace
-	Delete(ctx context.Context, workspace, webhookId string) (*models.ResponseScheme, error)
+	Delete(ctx context.Context, workspace, webhookID string) (*models.ResponseScheme, error)
 }
 
 // WorkspacePermissionConnector is where you can manage the workspace permissions
diff --git a/service/jira/field-config.go b/service/jira/field-config.go
index 4b4a400..9c18728 100644
--- a/service/jira/field-config.go
+++ b/service/jira/field-config.go
@@ -2,9 +2,11 @@ package jira
 
 import (
 	"context"
+
 	model "github.com/ctreminiom/go-atlassian/pkg/infra/models"
 )
 
+// FieldConfigConnector interface holds the methods available for the FieldConfig resource.
 type FieldConfigConnector interface {
 
 	// Gets Returns a paginated list of all field configurations.
@@ -91,7 +93,7 @@ type FieldConfigSchemeConnector interface {
 	// GET /rest/api/{2-3}/fieldconfigurationscheme/mapping
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/configuration/schemes#get-field-configuration-scheme-mapping
-	Mapping(ctx context.Context, fieldConfigIds []int, startAt, maxResults int) (*model.FieldConfigurationIssueTypeItemPageScheme,
+	Mapping(ctx context.Context, fieldConfigIDs []int, startAt, maxResults int) (*model.FieldConfigurationIssueTypeItemPageScheme,
 		*model.ResponseScheme, error)
 
 	// Project returns a paginated list of field configuration schemes and, for each scheme, a list of the projects that use it.
@@ -103,7 +105,7 @@ type FieldConfigSchemeConnector interface {
 	// GET /rest/api/{2-3}/fieldconfigurationscheme/project
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/configuration/schemes#get-field-configuration-schemes-by-project
-	Project(ctx context.Context, projectIds []int, startAt, maxResults int) (*model.FieldConfigurationSchemeProjectPageScheme,
+	Project(ctx context.Context, projectIDs []int, startAt, maxResults int) (*model.FieldConfigurationSchemeProjectPageScheme,
 		*model.ResponseScheme, error)
 
 	// Assign assigns a field configuration scheme to a project. If the field configuration scheme ID is null,
@@ -124,7 +126,7 @@ type FieldConfigSchemeConnector interface {
 	// PUT /rest/api/{2-3}/fieldconfigurationscheme/{id}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/configuration/schemes#update-field-configuration-scheme
-	Update(ctx context.Context, schemeId int, name, description string) (*model.ResponseScheme, error)
+	Update(ctx context.Context, schemeID int, name, description string) (*model.ResponseScheme, error)
 
 	// Delete deletes a field configuration scheme.
 	//
@@ -133,7 +135,7 @@ type FieldConfigSchemeConnector interface {
 	// DELETE /rest/api/{2-3}/fieldconfigurationscheme/{id}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/configuration/schemes#delete-field-configuration-scheme
-	Delete(ctx context.Context, schemeId int) (*model.ResponseScheme, error)
+	Delete(ctx context.Context, schemeID int) (*model.ResponseScheme, error)
 
 	// Link assigns issue types to field configurations on field configuration scheme.
 	//
@@ -142,7 +144,7 @@ type FieldConfigSchemeConnector interface {
 	// PUT /rest/api/{2-3}/fieldconfigurationscheme/{id}/mapping
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/configuration/schemes#assign-issue-types-to-field-configuration
-	Link(ctx context.Context, schemeId int, payload *model.FieldConfigurationToIssueTypeMappingPayloadScheme) (
+	Link(ctx context.Context, schemeID int, payload *model.FieldConfigurationToIssueTypeMappingPayloadScheme) (
 		*model.ResponseScheme, error)
 
 	// Unlink removes issue types from the field configuration scheme.
@@ -152,5 +154,5 @@ type FieldConfigSchemeConnector interface {
 	// POST /rest/api/{2-3}/fieldconfigurationscheme/{id}/mapping/delete
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/configuration/schemes#remove-issue-types-to-field-configuration
-	Unlink(ctx context.Context, schemeId int, issueTypeIDs []string) (*model.ResponseScheme, error)
+	Unlink(ctx context.Context, schemeID int, issueTypeIDs []string) (*model.ResponseScheme, error)
 }
diff --git a/service/jira/field-context.go b/service/jira/field-context.go
index 963ae9f..d5945f0 100644
--- a/service/jira/field-context.go
+++ b/service/jira/field-context.go
@@ -2,6 +2,7 @@ package jira
 
 import (
 	"context"
+
 	model "github.com/ctreminiom/go-atlassian/pkg/infra/models"
 )
 
@@ -26,40 +27,40 @@ type FieldContextConnector interface {
 	//
 	// 3. By defining isGlobalContext
 	//
-	// GET /rest/api/{2-3}/field/{fieldId}/context
+	// GET /rest/api/{2-3}/field/{fieldID}/context
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/context#get-custom-field-contexts
-	Gets(ctx context.Context, fieldId string, options *model.FieldContextOptionsScheme, startAt, maxResults int) (
+	Gets(ctx context.Context, fieldID string, options *model.FieldContextOptionsScheme, startAt, maxResults int) (
 		*model.CustomFieldContextPageScheme, *model.ResponseScheme, error)
 
 	// Create creates a custom field context.
 	//
-	// 1. If projectIds is empty, a global context is created. A global context is one that applies to all project.
+	// 1. If projectIDs is empty, a global context is created. A global context is one that applies to all project.
 	//
-	// 2. If issueTypeIds is empty, the context applies to all issue types.
+	// 2. If issueTypeIDs is empty, the context applies to all issue types.
 	//
-	// POST /rest/api/{2-3}/field/{fieldId}/context
+	// POST /rest/api/{2-3}/field/{fieldID}/context
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/context#create-custom-field-context
-	Create(ctx context.Context, fieldId string, payload *model.FieldContextPayloadScheme) (*model.FieldContextScheme,
+	Create(ctx context.Context, fieldID string, payload *model.FieldContextPayloadScheme) (*model.FieldContextScheme,
 		*model.ResponseScheme, error)
 
 	// GetDefaultValues returns a paginated list of defaults for a custom field.
 	//
-	// The results can be filtered by contextId, otherwise all values are returned. If no defaults are set for a context, nothing is returned.
+	// The results can be filtered by contextID, otherwise all values are returned. If no defaults are set for a context, nothing is returned.
 	//
-	// GET /rest/api/{2-3}/field/{fieldId}/context/defaultValue
+	// GET /rest/api/{2-3}/field/{fieldID}/context/defaultValue
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/context#get-custom-field-contexts-default-values
-	GetDefaultValues(ctx context.Context, fieldId string, contextIds []int, startAt, maxResults int) (*model.CustomFieldDefaultValuePageScheme,
+	GetDefaultValues(ctx context.Context, fieldID string, contextIDs []int, startAt, maxResults int) (*model.CustomFieldDefaultValuePageScheme,
 		*model.ResponseScheme, error)
 
 	// SetDefaultValue sets default for contexts of a custom field.
 	//
-	// PUT /rest/api/{2-3}/field/{fieldId}/context/defaultValue
+	// PUT /rest/api/{2-3}/field/{fieldID}/context/defaultValue
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/context#set-custom-field-contexts-default-values
-	SetDefaultValue(ctx context.Context, fieldId string, payload *model.FieldContextDefaultPayloadScheme) (*model.ResponseScheme, error)
+	SetDefaultValue(ctx context.Context, fieldID string, payload *model.FieldContextDefaultPayloadScheme) (*model.ResponseScheme, error)
 
 	// IssueTypesContext returns a paginated list of context to issue type mappings for a custom field.
 	//
@@ -67,58 +68,58 @@ type FieldContextConnector interface {
 	//
 	// 2. Mappings are ordered first by context ID and then by issue type ID.
 	//
-	// GET /rest/api/{2-3}/field/{fieldId}/context/issuetypemapping
+	// GET /rest/api/{2-3}/field/{fieldID}/context/issuetypemapping
 	//
 	// Docs: TODO: The documentation needs to be created, raise a ticket here: https://github.com/ctreminiom/go-atlassian/issues
-	IssueTypesContext(ctx context.Context, fieldId string, contextIds []int, startAt, maxResults int) (*model.IssueTypeToContextMappingPageScheme,
+	IssueTypesContext(ctx context.Context, fieldID string, contextIDs []int, startAt, maxResults int) (*model.IssueTypeToContextMappingPageScheme,
 		*model.ResponseScheme, error)
 
 	// ProjectsContext returns a paginated list of context to project mappings for a custom field.
 	//
-	// 1. The result can be filtered by contextId, or otherwise all mappings are returned.
+	// 1. The result can be filtered by contextID, or otherwise all mappings are returned.
 	//
 	// 2. Invalid IDs are ignored.
 	//
-	// GET /rest/api/{2-3}/field/{fieldId}/context/projectmapping
+	// GET /rest/api/{2-3}/field/{fieldID}/context/projectmapping
 	//
 	// Docs: TODO: The documentation needs to be created, raise a ticket here: https://github.com/ctreminiom/go-atlassian/issues
-	ProjectsContext(ctx context.Context, fieldId string, contextIds []int, startAt, maxResults int) (*model.CustomFieldContextProjectMappingPageScheme,
+	ProjectsContext(ctx context.Context, fieldID string, contextIDs []int, startAt, maxResults int) (*model.CustomFieldContextProjectMappingPageScheme,
 		*model.ResponseScheme, error)
 
 	// Update updates a custom field context
 	//
-	// PUT /rest/api/{2-3}/field/{fieldId}/context/{contextId}
+	// PUT /rest/api/{2-3}/field/{fieldID}/context/{contextID}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/context#update-custom-field-context
-	Update(ctx context.Context, fieldId string, contextId int, name, description string) (*model.ResponseScheme, error)
+	Update(ctx context.Context, fieldID string, contextID int, name, description string) (*model.ResponseScheme, error)
 
 	// Delete deletes a custom field context.
 	//
-	// DELETE /rest/api/{2-3}/field/{fieldId}/context/{contextId}
+	// DELETE /rest/api/{2-3}/field/{fieldID}/context/{contextID}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/context#delete-custom-field-context
-	Delete(ctx context.Context, fieldId string, contextId int) (*model.ResponseScheme, error)
+	Delete(ctx context.Context, fieldID string, contextID int) (*model.ResponseScheme, error)
 
 	// AddIssueTypes adds issue types to a custom field context, appending the issue types to the issue types list.
 	//
-	// PUT /rest/api/{2-3}/field/{fieldId}/context/{contextId}/issuetype
+	// PUT /rest/api/{2-3}/field/{fieldID}/context/{contextID}/issuetype
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/context#add-issue-types-to-context
-	AddIssueTypes(ctx context.Context, fieldId string, contextId int, issueTypesIds []string) (*model.ResponseScheme, error)
+	AddIssueTypes(ctx context.Context, fieldID string, contextID int, issueTypesIDs []string) (*model.ResponseScheme, error)
 
 	// RemoveIssueTypes removes issue types from a custom field context. A custom field context without any issue types applies to all issue types.
 	//
-	// POST /rest/api/{2-3}/field/{fieldId}/context/{contextId}/issuetype/remove
+	// POST /rest/api/{2-3}/field/{fieldID}/context/{contextID}/issuetype/remove
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/context#remove-issue-types-from-context
-	RemoveIssueTypes(ctx context.Context, fieldId string, contextId int, issueTypesIds []string) (*model.ResponseScheme, error)
+	RemoveIssueTypes(ctx context.Context, fieldID string, contextID int, issueTypesIDs []string) (*model.ResponseScheme, error)
 
 	// Link assigns a custom field context to projects. If any project in the request is assigned to any context of the custom field, the operation fails.
 	//
-	// PUT /rest/api/{2-3}/field/{fieldId}/context/{contextId}/project
+	// PUT /rest/api/{2-3}/field/{fieldID}/context/{contextID}/project
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/context#assign-custom-field-context-to-projects
-	Link(ctx context.Context, fieldId string, contextId int, projectIds []string) (*model.ResponseScheme, error)
+	Link(ctx context.Context, fieldID string, contextID int, projectIDs []string) (*model.ResponseScheme, error)
 
 	// UnLink removes a custom field context from projects.
 	//
@@ -126,10 +127,10 @@ type FieldContextConnector interface {
 	//
 	// 2. Removing all projects from a custom field context would result in it applying to all projects.
 	//
-	// POST /rest/api/{2-3}/field/{fieldId}/context/{contextId}/project/remove
+	// POST /rest/api/{2-3}/field/{fieldID}/context/{contextID}/project/remove
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/context#remove-custom-field-context-from-projects
-	UnLink(ctx context.Context, fieldId string, contextId int, projectIds []string) (*model.ResponseScheme, error)
+	UnLink(ctx context.Context, fieldID string, contextID int, projectIDs []string) (*model.ResponseScheme, error)
 }
 
 // FieldContextOptionConnector is the interface that wraps the Jira field context options
@@ -143,10 +144,10 @@ type FieldContextOptionConnector interface {
 	//
 	// Options are returned first then cascading options, in the order they display in Jira.
 	//
-	// GET /rest/api/{2-3}/field/{fieldId}/context/{contextId}/option
+	// GET /rest/api/{2-3}/field/{fieldID}/context/{contextID}/option
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/context/option#get-custom-field-options
-	Gets(ctx context.Context, fieldId string, contextId int, options *model.FieldOptionContextParams, startAt, maxResults int) (*model.CustomFieldContextOptionPageScheme, *model.ResponseScheme, error)
+	Gets(ctx context.Context, fieldID string, contextID int, options *model.FieldOptionContextParams, startAt, maxResults int) (*model.CustomFieldContextOptionPageScheme, *model.ResponseScheme, error)
 
 	// Create creates options and, where the custom select field is of the type Select List (cascading), cascading options for a custom select field.
 	//
@@ -154,10 +155,10 @@ type FieldContextOptionConnector interface {
 	//
 	// 2. The maximum number of options that can be created per request is 1000 and each field can have a maximum of 10000 options.
 	//
-	// POST /rest/api/{2-3}/field/{fieldId}/context/{contextId}/option
+	// POST /rest/api/{2-3}/field/{fieldID}/context/{contextID}/option
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/context/option#create-custom-field-options
-	Create(ctx context.Context, fieldId string, contextId int, payload *model.FieldContextOptionListScheme) (*model.FieldContextOptionListScheme, *model.ResponseScheme, error)
+	Create(ctx context.Context, fieldID string, contextID int, payload *model.FieldContextOptionListScheme) (*model.FieldContextOptionListScheme, *model.ResponseScheme, error)
 
 	// Update updates the options of a custom field.
 	//
@@ -165,24 +166,24 @@ type FieldContextOptionConnector interface {
 	//
 	// 2. Options where the values in the request match the current values aren't updated and aren't reported in the response.
 	//
-	// PUT /rest/api/{2-3}/field/{fieldId}/context/{contextId}/option
+	// PUT /rest/api/{2-3}/field/{fieldID}/context/{contextID}/option
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/context/option#update-custom-field-options
-	Update(ctx context.Context, fieldId string, contextId int, payload *model.FieldContextOptionListScheme) (*model.FieldContextOptionListScheme, *model.ResponseScheme, error)
+	Update(ctx context.Context, fieldID string, contextID int, payload *model.FieldContextOptionListScheme) (*model.FieldContextOptionListScheme, *model.ResponseScheme, error)
 
 	// Delete deletes a custom field option.
 	//
 	// 1. Options with cascading options cannot be deleted without deleting the cascading options first.
 	//
-	// DELETE /rest/api/{2-3}/field/{fieldId}/context/{contextId}/option/{optionId}
+	// DELETE /rest/api/{2-3}/field/{fieldID}/context/{contextID}/option/{optionID}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/context/option#delete-custom-field-options
-	Delete(ctx context.Context, fieldId string, contextId, optionId int) (*model.ResponseScheme, error)
+	Delete(ctx context.Context, fieldID string, contextID, optionID int) (*model.ResponseScheme, error)
 
 	// Order changes the order of custom field options or cascading options in a context.
 	//
-	// PUT /rest/api/{2-3}/field/{fieldId}/context/{contextId}/option/move
+	// PUT /rest/api/{2-3}/field/{fieldID}/context/{contextID}/option/move
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/issues/fields/context/option#reorder-custom-field-options
-	Order(ctx context.Context, fieldId string, contextId int, payload *model.OrderFieldOptionPayloadScheme) (*model.ResponseScheme, error)
+	Order(ctx context.Context, fieldID string, contextID int, payload *model.OrderFieldOptionPayloadScheme) (*model.ResponseScheme, error)
 }
diff --git a/service/jira/project.go b/service/jira/project.go
index 5f2d3b5..6de853f 100644
--- a/service/jira/project.go
+++ b/service/jira/project.go
@@ -2,6 +2,7 @@ package jira
 
 import (
 	"context"
+
 	model "github.com/ctreminiom/go-atlassian/pkg/infra/models"
 )
 
@@ -23,17 +24,17 @@ type ProjectConnector interface {
 
 	// Get returns the project details for a project.
 	//
-	// GET /rest/api/{2-3}project/{projectIdOrKey}
+	// GET /rest/api/{2-3}project/{projectKeyOrID}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects#get-project
-	Get(ctx context.Context, projectKeyOrId string, expand []string) (*model.ProjectScheme, *model.ResponseScheme, error)
+	Get(ctx context.Context, projectKeyOrID string, expand []string) (*model.ProjectScheme, *model.ResponseScheme, error)
 
 	// Update updates the project details of a project.
 	//
-	// PUT /rest/api/{2-3}/project/{projectIdOrKey}
+	// PUT /rest/api/{2-3}/project/{projectKeyOrID}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects#update-project
-	Update(ctx context.Context, projectKeyOrId string, payload *model.ProjectUpdateScheme) (*model.ProjectScheme, *model.ResponseScheme, error)
+	Update(ctx context.Context, projectKeyOrID string, payload *model.ProjectUpdateScheme) (*model.ProjectScheme, *model.ResponseScheme, error)
 
 	// Delete deletes a project.
 	//
@@ -41,10 +42,10 @@ type ProjectConnector interface {
 	//
 	// To restore a project, use the Jira UI.
 	//
-	// DELETE /rest/api/{2-3}/project/{projectIdOrKey}
+	// DELETE /rest/api/{2-3}/project/{projectKeyOrID}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects#delete-project
-	Delete(ctx context.Context, projectKeyOrId string, enableUndo bool) (*model.ResponseScheme, error)
+	Delete(ctx context.Context, projectKeyOrID string, enableUndo bool) (*model.ResponseScheme, error)
 
 	// DeleteAsynchronously deletes a project asynchronously.
 	//
@@ -52,10 +53,10 @@ type ProjectConnector interface {
 	//
 	// 2. asynchronous. Follow the location link in the response to determine the status of the task and use Get task to obtain subsequent updates.
 	//
-	// POST /rest/api/{2-3}/project/{projectIdOrKey}/delete
+	// POST /rest/api/{2-3}/project/{projectKeyOrID}/delete
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects#delete-project-asynchronously
-	DeleteAsynchronously(ctx context.Context, projectKeyOrId string) (*model.TaskScheme, *model.ResponseScheme, error)
+	DeleteAsynchronously(ctx context.Context, projectKeyOrID string) (*model.TaskScheme, *model.ResponseScheme, error)
 
 	// Archive archives a project. Archived projects cannot be deleted.
 	//
@@ -63,33 +64,33 @@ type ProjectConnector interface {
 	//
 	// To restore a project, use the Jira UI.
 	//
-	// POST /rest/api/{2-3}/project/{projectIdOrKey}/archive
+	// POST /rest/api/{2-3}/project/{projectKeyOrID}/archive
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects#archive-project
-	Archive(ctx context.Context, projectKeyOrId string) (*model.ResponseScheme, error)
+	Archive(ctx context.Context, projectKeyOrID string) (*model.ResponseScheme, error)
 
 	// Restore restores a project from the Jira recycle bin.
 	//
-	// POST /rest/api/3/project/{projectIdOrKey}/restore
+	// POST /rest/api/3/project/{projectKeyOrID}/restore
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects#restore-deleted-project
-	Restore(ctx context.Context, projectKeyOrId string) (*model.ProjectScheme, *model.ResponseScheme, error)
+	Restore(ctx context.Context, projectKeyOrID string) (*model.ProjectScheme, *model.ResponseScheme, error)
 
 	// Statuses returns the valid statuses for a project.
 	//
 	// The statuses are grouped by issue type, as each project has a set of valid issue types and each issue type has a set of valid statuses.
 	//
-	// GET /rest/api/{2-3}/project/{projectIdOrKey}/statuses
+	// GET /rest/api/{2-3}/project/{projectKeyOrID}/statuses
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects#get-all-statuses-for-project
-	Statuses(ctx context.Context, projectKeyOrId string) ([]*model.ProjectStatusPageScheme, *model.ResponseScheme, error)
+	Statuses(ctx context.Context, projectKeyOrID string) ([]*model.ProjectStatusPageScheme, *model.ResponseScheme, error)
 
 	// NotificationScheme gets the notification scheme associated with the project.
 	//
-	// GET /rest/api/{2-3}/project/{projectKeyOrId}/notificationscheme
+	// GET /rest/api/{2-3}/project/{projectKeyOrID}/notificationscheme
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects#get-project-notification-scheme
-	NotificationScheme(ctx context.Context, projectKeyOrId string, expand []string) (*model.NotificationSchemeScheme, *model.ResponseScheme, error)
+	NotificationScheme(ctx context.Context, projectKeyOrID string, expand []string) (*model.NotificationSchemeScheme, *model.ResponseScheme, error)
 }
 
 type ProjectCategoryConnector interface {
@@ -106,7 +107,7 @@ type ProjectCategoryConnector interface {
 	// GET /rest/api/{2-3}/projectCategory/{id}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/categories#get-project-category-by-id
-	Get(ctx context.Context, categoryId int) (*model.ProjectCategoryScheme, *model.ResponseScheme, error)
+	Get(ctx context.Context, categoryID int) (*model.ProjectCategoryScheme, *model.ResponseScheme, error)
 
 	// Create creates a project category.
 	//
@@ -120,14 +121,14 @@ type ProjectCategoryConnector interface {
 	// PUT /rest/api/{2-3}/projectCategory/{id}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/categories#update-project-category
-	Update(ctx context.Context, categoryId int, payload *model.ProjectCategoryPayloadScheme) (*model.ProjectCategoryScheme, *model.ResponseScheme, error)
+	Update(ctx context.Context, categoryID int, payload *model.ProjectCategoryPayloadScheme) (*model.ProjectCategoryScheme, *model.ResponseScheme, error)
 
 	// Delete deletes a project category.
 	//
 	// DELETE /rest/api/{2-3}/projectCategory/{id}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/categories#delete-project-category
-	Delete(ctx context.Context, categoryId int) (*model.ResponseScheme, error)
+	Delete(ctx context.Context, categoryID int) (*model.ResponseScheme, error)
 }
 
 type ProjectComponentConnector interface {
@@ -141,24 +142,24 @@ type ProjectComponentConnector interface {
 
 	// Gets returns all components in a project.
 	//
-	// GET /rest/api/{2-3}/project/{projectIdOrKey}/components
+	// GET /rest/api/{2-3}/project/{projectKeyOrID}/components
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/components#get-project-components
-	Gets(ctx context.Context, projectIdOrKey string) ([]*model.ComponentScheme, *model.ResponseScheme, error)
+	Gets(ctx context.Context, projectKeyOrID string) ([]*model.ComponentScheme, *model.ResponseScheme, error)
 
 	// Count returns the counts of issues assigned to the component.
 	//
 	// GET /rest/api/{2-3}/component/{id}/relatedIssueCounts
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/components#get-component-issues-count
-	Count(ctx context.Context, componentId string) (*model.ComponentCountScheme, *model.ResponseScheme, error)
+	Count(ctx context.Context, componentID string) (*model.ComponentCountScheme, *model.ResponseScheme, error)
 
 	// Delete deletes a component.
 	//
 	// DELETE /rest/api/{2-3}/component/{id}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/components#delete-component
-	Delete(ctx context.Context, componentId string) (*model.ResponseScheme, error)
+	Delete(ctx context.Context, componentID string) (*model.ResponseScheme, error)
 
 	// Update updates a component.
 	//
@@ -167,72 +168,72 @@ type ProjectComponentConnector interface {
 	// PUT /rest/api/{2-3}/component/{id}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/components#update-component
-	Update(ctx context.Context, componentId string, payload *model.ComponentPayloadScheme) (*model.ComponentScheme, *model.ResponseScheme, error)
+	Update(ctx context.Context, componentID string, payload *model.ComponentPayloadScheme) (*model.ComponentScheme, *model.ResponseScheme, error)
 
 	// Get returns a component.
 	//
 	// GET /rest/api/{2-3}/component/{id}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/components#get-component
-	Get(ctx context.Context, componentId string) (*model.ComponentScheme, *model.ResponseScheme, error)
+	Get(ctx context.Context, componentID string) (*model.ComponentScheme, *model.ResponseScheme, error)
 }
 
 type ProjectFeatureConnector interface {
 
 	// Gets returns the list of features for a project.
 	//
-	// GET /rest/api/{2-3}/project/{projectIdOrKey}/features
+	// GET /rest/api/{2-3}/project/{projectKeyOrID}/features
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/features#get-project-features
-	Gets(ctx context.Context, projectKeyOrId string) (*model.ProjectFeaturesScheme, *model.ResponseScheme, error)
+	Gets(ctx context.Context, projectKeyOrID string) (*model.ProjectFeaturesScheme, *model.ResponseScheme, error)
 
 	// Set sets the state of a project feature.
 	//
-	// PUT /rest/api/{2-3}/project/{projectIdOrKey}/features/{featureKey}
+	// PUT /rest/api/{2-3}/project/{projectKeyOrID}/features/{featureKey}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/features#set-project-feature-state
-	Set(ctx context.Context, projectKeyOrId, featureKey, state string) (*model.ProjectFeaturesScheme, *model.ResponseScheme, error)
+	Set(ctx context.Context, projectKeyOrID, featureKey, state string) (*model.ProjectFeaturesScheme, *model.ResponseScheme, error)
 }
 
 type ProjectPermissionSchemeConnector interface {
 
 	// Get search the permission scheme associated with the project.
 	//
-	// GET /rest/api/{2-3}/project/{projectKeyOrId}/permissionscheme
+	// GET /rest/api/{2-3}/project/{projectKeyOrID}/permissionscheme
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/permission-schemes#get-assigned-permission-scheme
-	Get(ctx context.Context, projectKeyOrId string, expand []string) (*model.PermissionSchemeScheme, *model.ResponseScheme, error)
+	Get(ctx context.Context, projectKeyOrID string, expand []string) (*model.PermissionSchemeScheme, *model.ResponseScheme, error)
 
 	// Assign assigns a permission scheme with a project.
 	//
 	// See Managing project permissions for more information about permission schemes.
 	//
-	// PUT /rest/api/{2-3}/project/{projectKeyOrId}/permissionscheme
-	Assign(ctx context.Context, projectKeyOrId string, permissionSchemeId int) (*model.PermissionSchemeScheme, *model.ResponseScheme, error)
+	// PUT /rest/api/{2-3}/project/{projectKeyOrID}/permissionscheme
+	Assign(ctx context.Context, projectKeyOrID string, permissionSchemeID int) (*model.PermissionSchemeScheme, *model.ResponseScheme, error)
 
 	// SecurityLevels returns all issue security levels for the project that the user has access to.
 	//
-	// GET /rest/api/{2-3}/project/{projectKeyOrId}/securitylevel
+	// GET /rest/api/{2-3}/project/{projectKeyOrID}/securitylevel
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/permission-schemes#get-project-issue-security-levels
-	SecurityLevels(ctx context.Context, projectKeyOrId string) (*model.IssueSecurityLevelsScheme, *model.ResponseScheme, error)
+	SecurityLevels(ctx context.Context, projectKeyOrID string) (*model.IssueSecurityLevelsScheme, *model.ResponseScheme, error)
 }
 
 type ProjectPropertyConnector interface {
 
 	// Gets returns all project property keys for the project.
 	//
-	// GET /rest/api/{2-3}/project/{projectIdOrKey}/properties
+	// GET /rest/api/{2-3}/project/{projectKeyOrID}/properties
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/properties#get-project-properties-keys
-	Gets(ctx context.Context, projectKeyOrId string) (*model.PropertyPageScheme, *model.ResponseScheme, error)
+	Gets(ctx context.Context, projectKeyOrID string) (*model.PropertyPageScheme, *model.ResponseScheme, error)
 
 	// Get returns the value of a project property.
 	//
-	// GET /rest/api/{2-3}/project/{projectIdOrKey}/properties/{propertyKey}
+	// GET /rest/api/{2-3}/project/{projectKeyOrID}/properties/{propertyKey}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/properties#get-project-property
-	Get(ctx context.Context, projectKeyOrId, propertyKey string) (*model.EntityPropertyScheme, *model.ResponseScheme, error)
+	Get(ctx context.Context, projectKeyOrID, propertyKey string) (*model.EntityPropertyScheme, *model.ResponseScheme, error)
 
 	// Set sets the value of the project property.
 	//
@@ -242,41 +243,41 @@ type ProjectPropertyConnector interface {
 	//
 	// The maximum length is 32768 characters.
 	//
-	// PUT /rest/api/{2-3}/project/{projectIdOrKey}/properties/{propertyKey}
+	// PUT /rest/api/{2-3}/project/{projectKeyOrID}/properties/{propertyKey}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/properties#set-project-property
-	Set(ctx context.Context, projectKeyOrId, propertyKey string, payload interface{}) (*model.ResponseScheme, error)
+	Set(ctx context.Context, projectKeyOrID, propertyKey string, payload interface{}) (*model.ResponseScheme, error)
 
 	// Delete deletes the property from a project.
 	//
-	// DELETE /rest/api/{2-3}/project/{projectIdOrKey}/properties/{propertyKey}
+	// DELETE /rest/api/{2-3}/project/{projectKeyOrID}/properties/{propertyKey}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/properties#delete-project-property
-	Delete(ctx context.Context, projectKeyOrId, propertyKey string) (*model.ResponseScheme, error)
+	Delete(ctx context.Context, projectKeyOrID, propertyKey string) (*model.ResponseScheme, error)
 }
 
 type ProjectRoleConnector interface {
 
 	// Gets returns a list of project roles for the project returning the name and self URL for each role.
 	//
-	// GET /rest/api/{2-3}/project/{projectIdOrKey}/role
+	// GET /rest/api/{2-3}/project/{projectKeyOrID}/role
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/roles#get-project-roles-for-project
-	Gets(ctx context.Context, projectKeyOrId string) (*map[string]int, *model.ResponseScheme, error)
+	Gets(ctx context.Context, projectKeyOrID string) (*map[string]int, *model.ResponseScheme, error)
 
 	// Get returns a project role's details and actors associated with the project.
 	//
-	// GET /rest/api/{2-3}/project/{projectIdOrKey}/role/{id}
+	// GET /rest/api/{2-3}/project/{projectKeyOrID}/role/{id}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/roles#get-project-role-for-project
-	Get(ctx context.Context, projectKeyOrId string, roleId int) (*model.ProjectRoleScheme, *model.ResponseScheme, error)
+	Get(ctx context.Context, projectKeyOrID string, roleID int) (*model.ProjectRoleScheme, *model.ResponseScheme, error)
 
 	// Details returns all project roles and the details for each role.
 	//
-	// GET /rest/api/{2-3}/project/{projectIdOrKey}/roledetails
+	// GET /rest/api/{2-3}/project/{projectKeyOrID}/roledetails
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/roles#get-project-role-details
-	Details(ctx context.Context, projectKeyOrId string) ([]*model.ProjectRoleDetailScheme, *model.ResponseScheme, error)
+	Details(ctx context.Context, projectKeyOrID string) ([]*model.ProjectRoleDetailScheme, *model.ResponseScheme, error)
 
 	// Global gets a list of all project roles, complete with project role details and default actors.
 	//
@@ -297,17 +298,17 @@ type ProjectRoleActorConnector interface {
 
 	// Add adds actors to a project role for the project.
 	//
-	// POST /rest/api/{2-3}/project/{projectIdOrKey}/role/{id}
+	// POST /rest/api/{2-3}/project/{projectKeyOrID}/role/{id}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/roles/actors#add-actors-to-project-role
-	Add(ctx context.Context, projectKeyOrId string, roleId int, accountIds, groups []string) (*model.ProjectRoleScheme, *model.ResponseScheme, error)
+	Add(ctx context.Context, projectKeyOrID string, roleID int, accountIDs, groups []string) (*model.ProjectRoleScheme, *model.ResponseScheme, error)
 
 	// Delete deletes actors from a project role for the project.
 	//
-	// DELETE /rest/api/{2-3}/project/{projectIdOrKey}/role/{id}
+	// DELETE /rest/api/{2-3}/project/{projectKeyOrID}/role/{id}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/roles/actors#delete-actors-from-project-role
-	Delete(ctx context.Context, projectKeyOrId string, roleId int, accountId, group string) (*model.ResponseScheme, error)
+	Delete(ctx context.Context, projectKeyOrID string, roleID int, accountID, group string) (*model.ResponseScheme, error)
 }
 
 type ProjectTypeConnector interface {
@@ -381,17 +382,17 @@ type ProjectVersionConnector interface {
 	//
 	// Use Search() if you want to get the versions in a project with pagination.
 	//
-	// GET /rest/api/{2-3}/project/{projectIdOrKey}/versions
+	// GET /rest/api/{2-3}/project/{projectKeyOrID}/versions
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/versions#get-project-versions
-	Gets(ctx context.Context, projectKeyOrId string) ([]*model.VersionScheme, *model.ResponseScheme, error)
+	Gets(ctx context.Context, projectKeyOrID string) ([]*model.VersionScheme, *model.ResponseScheme, error)
 
 	// Search returns a paginated list of all versions in a project.
 	//
-	// GET /rest/api/{2-3}/project/{projectIdOrKey}/version
+	// GET /rest/api/{2-3}/project/{projectKeyOrID}/version
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/versions#get-project-versions-paginated
-	Search(ctx context.Context, projectKeyOrId string, options *model.VersionGetsOptions, startAt, maxResults int) (*model.VersionPageScheme, *model.ResponseScheme, error)
+	Search(ctx context.Context, projectKeyOrID string, options *model.VersionGetsOptions, startAt, maxResults int) (*model.VersionPageScheme, *model.ResponseScheme, error)
 
 	// Create creates a project version.
 	//
@@ -405,14 +406,14 @@ type ProjectVersionConnector interface {
 	// GET /rest/api/{2-3}/version/{id}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/versions#get-version
-	Get(ctx context.Context, versionId string, expand []string) (*model.VersionScheme, *model.ResponseScheme, error)
+	Get(ctx context.Context, versionID string, expand []string) (*model.VersionScheme, *model.ResponseScheme, error)
 
 	// Update updates a project version.
 	//
 	// PUT /rest/api/{2-3}/version/{id}
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/versions#update-version
-	Update(ctx context.Context, versionId string, payload *model.VersionPayloadScheme) (*model.VersionScheme, *model.ResponseScheme, error)
+	Update(ctx context.Context, versionID string, payload *model.VersionPayloadScheme) (*model.VersionScheme, *model.ResponseScheme, error)
 
 	// Merge merges two project versions.
 	//
@@ -421,7 +422,7 @@ type ProjectVersionConnector interface {
 	// its ID in fixVersion with the version ID specified in moveIssuesTo.
 	//
 	// PUT /rest/api/{2-3}/version/{id}/mergeto/{moveIssuesTo}
-	Merge(ctx context.Context, versionId, versionMoveIssuesTo string) (*model.ResponseScheme, error)
+	Merge(ctx context.Context, versionID, versionMoveIssuesTo string) (*model.ResponseScheme, error)
 
 	// RelatedIssueCounts returns the following counts for a version:
 	//
@@ -434,12 +435,12 @@ type ProjectVersionConnector interface {
 	// GET /rest/api/{2-3}/version/{id}/relatedIssueCounts
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/versions#get-versions-related-issues-count
-	RelatedIssueCounts(ctx context.Context, versionId string) (*model.VersionIssueCountsScheme, *model.ResponseScheme, error)
+	RelatedIssueCounts(ctx context.Context, versionID string) (*model.VersionIssueCountsScheme, *model.ResponseScheme, error)
 
 	// UnresolvedIssueCount returns counts of the issues and unresolved issues for the project version.
 	//
 	// GET /rest/api/{2-3}/version/{id}/unresolvedIssueCount
 	//
 	// https://docs.go-atlassian.io/jira-software-cloud/projects/versions#get-versions-unresolved-issues-count
-	UnresolvedIssueCount(ctx context.Context, versionId string) (*model.VersionUnresolvedIssuesCountScheme, *model.ResponseScheme, error)
+	UnresolvedIssueCount(ctx context.Context, versionID string) (*model.VersionUnresolvedIssuesCountScheme, *model.ResponseScheme, error)
 }
diff --git a/service/jira/remote-link.go b/service/jira/remote-link.go
index c17c587..b94568c 100644
--- a/service/jira/remote-link.go
+++ b/service/jira/remote-link.go
@@ -6,6 +6,7 @@ import (
 	"github.com/ctreminiom/go-atlassian/pkg/infra/models"
 )
 
+// RemoteLinkConnector is the interface that wraps the Jira remote link methods.
 type RemoteLinkConnector interface {
 
 	// Gets returns the remote issue links for an issue.


Test patch:
diff --git a/assets/internal/object_type_impl_test.go b/assets/internal/object_type_impl_test.go
index 9535e01..ca35d5c 100644
--- a/assets/internal/object_type_impl_test.go
+++ b/assets/internal/object_type_impl_test.go
@@ -398,7 +398,7 @@ func Test_internalObjectTypeImpl_Update(t *testing.T) {
 	payloadMocked := &model.ObjectTypePayloadScheme{
 		Name:               "Office",
 		Description:        "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin nec ex.",
-		IconId:             "13",
+		IconID:             "13",
 		ObjectSchemaID:     "",
 		ParentObjectTypeID: "",
 		Inherited:          true,
@@ -538,7 +538,7 @@ func Test_internalObjectTypeImpl_Create(t *testing.T) {
 	payloadMocked := &model.ObjectTypePayloadScheme{
 		Name:               "Office",
 		Description:        "Lorem ipsum dolor sit amet, consectetur adipiscing elit. Proin nec ex.",
-		IconId:             "13",
+		IconID:             "13",
 		ObjectSchemaID:     "",
 		ParentObjectTypeID: "",
 		Inherited:          true,
diff --git a/bitbucket/api_client_impl_test.go b/bitbucket/api_client_impl_test.go
index f7ff97d..a8a34e6 100644
--- a/bitbucket/api_client_impl_test.go
+++ b/bitbucket/api_client_impl_test.go
@@ -4,16 +4,18 @@ import (
 	"bytes"
 	"context"
 	"errors"
-	"github.com/ctreminiom/go-atlassian/bitbucket/internal"
-	model "github.com/ctreminiom/go-atlassian/pkg/infra/models"
-	"github.com/ctreminiom/go-atlassian/service/common"
-	"github.com/ctreminiom/go-atlassian/service/mocks"
-	"github.com/stretchr/testify/assert"
 	"io"
 	"net/http"
 	"net/url"
 	"strings"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
+
+	"github.com/ctreminiom/go-atlassian/bitbucket/internal"
+	model "github.com/ctreminiom/go-atlassian/pkg/infra/models"
+	"github.com/ctreminiom/go-atlassian/service/common"
+	"github.com/ctreminiom/go-atlassian/service/mocks"
 )
 
 func TestClient_Call(t *testing.T) {
@@ -389,7 +391,7 @@ func TestClient_NewRequest(t *testing.T) {
 
 func TestClient_processResponse(t *testing.T) {
 
-	expectedJsonResponse := `
+	expectedJSONResponse := `
 	{
 	  "id": 4,
 	  "self": "https://ctreminiom.atlassian.net/rest/agile/1.0/board/4",
@@ -399,7 +401,7 @@ func TestClient_processResponse(t *testing.T) {
 
 	expectedResponse := &http.Response{
 		StatusCode: http.StatusOK,
-		Body:       io.NopCloser(strings.NewReader(expectedJsonResponse)),
+		Body:       io.NopCloser(strings.NewReader(expectedJSONResponse)),
 		Request: &http.Request{
 			Method: http.MethodGet,
 			URL:    &url.URL{},
@@ -435,7 +437,7 @@ func TestClient_processResponse(t *testing.T) {
 				Response: expectedResponse,
 				Code:     http.StatusOK,
 				Method:   http.MethodGet,
-				Bytes:    *bytes.NewBufferString(expectedJsonResponse),
+				Bytes:    *bytes.NewBufferString(expectedJSONResponse),
 			},
 			wantErr: false,
 		},
diff --git a/bitbucket/internal/workspace_webhooks_impl_test.go b/bitbucket/internal/workspace_webhooks_impl_test.go
index f8abca6..b2b443b 100644
--- a/bitbucket/internal/workspace_webhooks_impl_test.go
+++ b/bitbucket/internal/workspace_webhooks_impl_test.go
@@ -131,7 +131,7 @@ func Test_internalWorkspaceWebhookServiceImpl_Get(t *testing.T) {
 	type args struct {
 		ctx       context.Context
 		workspace string
-		webhookId string
+		webhookID string
 	}
 
 	testCases := []struct {
@@ -147,7 +147,7 @@ func Test_internalWorkspaceWebhookServiceImpl_Get(t *testing.T) {
 			args: args{
 				ctx:       context.Background(),
 				workspace: "work-space-name-sample",
-				webhookId: "uuid-sample",
+				webhookID: "uuid-sample",
 			},
 			on: func(fields *fields) {
 
@@ -174,7 +174,7 @@ func Test_internalWorkspaceWebhookServiceImpl_Get(t *testing.T) {
 			args: args{
 				ctx:       context.Background(),
 				workspace: "work-space-name-sample",
-				webhookId: "uuid-sample",
+				webhookID: "uuid-sample",
 			},
 			on: func(fields *fields) {
 
@@ -224,7 +224,7 @@ func Test_internalWorkspaceWebhookServiceImpl_Get(t *testing.T) {
 
 			newService := NewWorkspaceHookService(testCase.fields.c)
 
-			gotResult, gotResponse, err := newService.Get(testCase.args.ctx, testCase.args.workspace, testCase.args.webhookId)
+			gotResult, gotResponse, err := newService.Get(testCase.args.ctx, testCase.args.workspace, testCase.args.webhookID)
 
 			if testCase.wantErr {
 
@@ -379,7 +379,7 @@ func Test_internalWorkspaceWebhookServiceImpl_Update(t *testing.T) {
 	type args struct {
 		ctx       context.Context
 		workspace string
-		webhookId string
+		webhookID string
 		payload   *model.WebhookSubscriptionPayloadScheme
 	}
 
@@ -396,7 +396,7 @@ func Test_internalWorkspaceWebhookServiceImpl_Update(t *testing.T) {
 			args: args{
 				ctx:       context.Background(),
 				workspace: "work-space-name-sample",
-				webhookId: "webhook-uuid",
+				webhookID: "webhook-uuid",
 				payload:   payloadMocked,
 			},
 			on: func(fields *fields) {
@@ -424,7 +424,7 @@ func Test_internalWorkspaceWebhookServiceImpl_Update(t *testing.T) {
 			args: args{
 				ctx:       context.Background(),
 				workspace: "work-space-name-sample",
-				webhookId: "webhook-uuid",
+				webhookID: "webhook-uuid",
 				payload:   payloadMocked,
 			},
 			on: func(fields *fields) {
@@ -476,7 +476,7 @@ func Test_internalWorkspaceWebhookServiceImpl_Update(t *testing.T) {
 			newService := NewWorkspaceHookService(testCase.fields.c)
 
 			gotResult, gotResponse, err := newService.Update(testCase.args.ctx, testCase.args.workspace,
-				testCase.args.webhookId, testCase.args.payload)
+				testCase.args.webhookID, testCase.args.payload)
 
 			if testCase.wantErr {
 
@@ -505,7 +505,7 @@ func Test_internalWorkspaceWebhookServiceImpl_Delete(t *testing.T) {
 	type args struct {
 		ctx       context.Context
 		workspace string
-		webhookId string
+		webhookID string
 	}
 
 	testCases := []struct {
@@ -521,7 +521,7 @@ func Test_internalWorkspaceWebhookServiceImpl_Delete(t *testing.T) {
 			args: args{
 				ctx:       context.Background(),
 				workspace: "work-space-name-sample",
-				webhookId: "uuid-sample",
+				webhookID: "uuid-sample",
 			},
 			on: func(fields *fields) {
 
@@ -548,7 +548,7 @@ func Test_internalWorkspaceWebhookServiceImpl_Delete(t *testing.T) {
 			args: args{
 				ctx:       context.Background(),
 				workspace: "work-space-name-sample",
-				webhookId: "uuid-sample",
+				webhookID: "uuid-sample",
 			},
 			on: func(fields *fields) {
 
@@ -598,7 +598,7 @@ func Test_internalWorkspaceWebhookServiceImpl_Delete(t *testing.T) {
 
 			newService := NewWorkspaceHookService(testCase.fields.c)
 
-			gotResponse, err := newService.Delete(testCase.args.ctx, testCase.args.workspace, testCase.args.webhookId)
+			gotResponse, err := newService.Delete(testCase.args.ctx, testCase.args.workspace, testCase.args.webhookID)
 
 			if testCase.wantErr {
 
diff --git a/jira/sm/internal/type_impl_test.go b/jira/sm/internal/type_impl_test.go
index 5f7f353..f466dc2 100644
--- a/jira/sm/internal/type_impl_test.go
+++ b/jira/sm/internal/type_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_internalTypeImpl_Search(t *testing.T) {
@@ -757,7 +759,7 @@ func Test_internalTypeImpl_Create(t *testing.T) {
 	payloadMocked := &model.RequestTypePayloadScheme{
 		Description: "Get IT Help",
 		HelpText:    "Please tell us clearly the problem you have within 100 words.",
-		IssueTypeId: "12345",
+		IssueTypeID: "12345",
 		Name:        "Get IT Help"}
 
 	type fields struct {
@@ -786,7 +788,7 @@ func Test_internalTypeImpl_Create(t *testing.T) {
 				payload: &model.RequestTypePayloadScheme{
 					Description: "Get IT Help",
 					HelpText:    "Please tell us clearly the problem you have within 100 words.",
-					IssueTypeId: "12345",
+					IssueTypeID: "12345",
 					Name:        "Get IT Help",
 				},
 			},
@@ -819,7 +821,7 @@ func Test_internalTypeImpl_Create(t *testing.T) {
 				payload: &model.RequestTypePayloadScheme{
 					Description: "Get IT Help",
 					HelpText:    "Please tell us clearly the problem you have within 100 words.",
-					IssueTypeId: "12345",
+					IssueTypeID: "12345",
 					Name:        "Get IT Help",
 				},
 			},
@@ -854,7 +856,7 @@ func Test_internalTypeImpl_Create(t *testing.T) {
 				payload: &model.RequestTypePayloadScheme{
 					Description: "Get IT Help",
 					HelpText:    "Please tell us clearly the problem you have within 100 words.",
-					IssueTypeId: "12345",
+					IssueTypeID: "12345",
 					Name:        "Get IT Help",
 				},
 			},
diff --git a/pkg/infra/models/jira_issue_operations_test.go b/pkg/infra/models/jira_issue_operations_test.go
index 6a5d44f..a471007 100644
--- a/pkg/infra/models/jira_issue_operations_test.go
+++ b/pkg/infra/models/jira_issue_operations_test.go
@@ -3,9 +3,10 @@ package models
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/stretchr/testify/assert"
 	"reflect"
 	"testing"
+
+	"github.com/stretchr/testify/assert"
 )
 
 func TestUpdateOperations_AddArrayOperation(t *testing.T) {
@@ -147,7 +148,7 @@ func TestUpdateOperations_AddStringOperation(t *testing.T) {
 
 func TestUpdateOperations_AddMultiRawOperation(t *testing.T) {
 
-	expectedJson := `[{"update":{"custom_field_id":[{"add":{"id":"10001"}},{"remove":{"name":"Version 00"}},{"add":{"id":"1010"}}]}}]`
+	expectedJSON := `[{"update":{"custom_field_id":[{"add":{"id":"10001"}},{"remove":{"name":"Version 00"}},{"add":{"id":"1010"}}]}}]`
 
 	type fields struct {
 		Fields []map[string]interface{}
@@ -215,7 +216,7 @@ func TestUpdateOperations_AddMultiRawOperation(t *testing.T) {
 					t.Fatal(err)
 				}
 
-				assert.Equal(t, expectedJson, string(actualJSON))
+				assert.Equal(t, expectedJSON, string(actualJSON))
 			}
 		})
 	}