diff --git a/pkg/service/script_policy.go b/pkg/service/script_policy.go
index 20b070b..044a925 100644
--- a/pkg/service/script_policy.go
+++ b/pkg/service/script_policy.go
@@ -14,7 +14,7 @@ import (
 //
 // POST /script-policy
 func (svc *Service) CreateScriptPolicy(ctx context.Context, req *api.ScriptPolicyCreate) (*api.ID, error) {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return nil, ErrUserInfo
 	}
@@ -99,7 +99,7 @@ func (svc *Service) ListScriptPolicy(ctx context.Context, params api.ListScriptP
 //
 // DELETE /script-policy/{ScriptPolicyID}
 func (svc *Service) DeleteScriptPolicy(ctx context.Context, params api.DeleteScriptPolicyParams) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return ErrUserInfo
 	}
@@ -121,7 +121,7 @@ func (svc *Service) DeleteScriptPolicy(ctx context.Context, params api.DeleteScr
 //
 // GET /script-policy/{ScriptPolicyID}
 func (svc *Service) GetScriptPolicy(ctx context.Context, params api.GetScriptPolicyParams) (*api.ScriptPolicy, error) {
-	_, ok := ctx.Value("UserInfo").(UserInfo)
+	_, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return nil, ErrUserInfo
 	}
@@ -147,7 +147,7 @@ func (svc *Service) GetScriptPolicy(ctx context.Context, params api.GetScriptPol
 //
 // POST /script-policy/{ScriptPolicyID}
 func (svc *Service) UpdateScriptPolicy(ctx context.Context, req *api.ScriptPolicyUpdate, params api.UpdateScriptPolicyParams) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return ErrUserInfo
 	}
diff --git a/pkg/service/scripts.go b/pkg/service/scripts.go
index 0be1783..2a67e84 100644
--- a/pkg/service/scripts.go
+++ b/pkg/service/scripts.go
@@ -14,7 +14,7 @@ import (
 //
 // POST /scripts
 func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*api.ID, error) {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return nil, ErrUserInfo
 	}
@@ -95,7 +95,7 @@ func (svc *Service) ListScripts(ctx context.Context, params api.ListScriptsParam
 //
 // DELETE /scripts/{ScriptID}
 func (svc *Service) DeleteScript(ctx context.Context, params api.DeleteScriptParams) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return ErrUserInfo
 	}
@@ -117,7 +117,7 @@ func (svc *Service) DeleteScript(ctx context.Context, params api.DeleteScriptPar
 //
 // GET /scripts/{ScriptID}
 func (svc *Service) GetScript(ctx context.Context, params api.GetScriptParams) (*api.Script, error) {
-	_, ok := ctx.Value("UserInfo").(UserInfo)
+	_, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return nil, ErrUserInfo
 	}
@@ -144,7 +144,7 @@ func (svc *Service) GetScript(ctx context.Context, params api.GetScriptParams) (
 //
 // PATCH /scripts/{ScriptID}
 func (svc *Service) UpdateScript(ctx context.Context, req *api.ScriptUpdate, params api.UpdateScriptParams) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return ErrUserInfo
 	}
diff --git a/pkg/service/security.go b/pkg/service/security.go
index e48a574..ac70844 100644
--- a/pkg/service/security.go
+++ b/pkg/service/security.go
@@ -24,14 +24,14 @@ var (
 	RoleMapCouncil Role = 64
 )
 
-type UserInfo struct {
+type UserInfoHandle struct {
 	// Would love to know a better way to do this
 	svc       *SecurityHandler
 	ctx       *context.Context
 	sessionId string
 }
 
-func (usr UserInfo) GetUserID() (uint64, error) {
+func (usr UserInfoHandle) GetUserID() (uint64, error) {
 	session, err := usr.svc.Client.GetSessionUser(*usr.ctx, &auth.IdMessage{
 		SessionID: usr.sessionId,
 	})
@@ -40,14 +40,14 @@ func (usr UserInfo) GetUserID() (uint64, error) {
 	}
 	return session.UserID, nil
 }
-func (usr UserInfo) IsSubmitter(submitter uint64) (bool, error) {
+func (usr UserInfoHandle) IsSubmitter(submitter uint64) (bool, error) {
 	userId, err := usr.GetUserID()
 	if err != nil {
 		return false, err
 	}
 	return userId == submitter, nil
 }
-func (usr UserInfo) hasRole(role Role) (bool, error) {
+func (usr UserInfoHandle) hasRole(role Role) (bool, error) {
 	roles, err := usr.svc.Client.GetGroupRole(*usr.ctx, &auth.IdMessage{
 		SessionID: usr.sessionId,
 	})
@@ -66,17 +66,17 @@ func (usr UserInfo) hasRole(role Role) (bool, error) {
 
 // RoleThumbnail
 // RoleMapDownload
-func (usr UserInfo) HasRoleSubmissionRelease() (bool, error) {
+func (usr UserInfoHandle) HasRoleSubmissionRelease() (bool, error) {
 	return usr.hasRole(RoleMapAdmin)
 }
-func (usr UserInfo) HasRoleSubmissionReview() (bool, error) {
+func (usr UserInfoHandle) HasRoleSubmissionReview() (bool, error) {
 	return usr.hasRole(RoleMapCouncil)
 }
-func (usr UserInfo) HasRoleScriptWrite() (bool, error) {
+func (usr UserInfoHandle) HasRoleScriptWrite() (bool, error) {
 	return usr.hasRole(RoleQuat)
 }
 /// Not implemented
-func (usr UserInfo) HasRoleMaptest() (bool, error) {
+func (usr UserInfoHandle) HasRoleMaptest() (bool, error) {
 	println("HasRoleMaptest is not implemented!")
 	return false, nil
 }
@@ -101,7 +101,7 @@ func (svc SecurityHandler) HandleCookieAuth(ctx context.Context, operationName a
 		return nil, ErrInvalidSession
 	}
 
-	newCtx := context.WithValue(ctx, "UserInfo", UserInfo{
+	newCtx := context.WithValue(ctx, "UserInfo", UserInfoHandle{
 		svc:       &svc,
 		ctx:       &ctx,
 		sessionId: sessionId,
diff --git a/pkg/service/submissions.go b/pkg/service/submissions.go
index 3ca7029..97eaeb6 100644
--- a/pkg/service/submissions.go
+++ b/pkg/service/submissions.go
@@ -41,7 +41,7 @@ var (
 
 // POST /submissions
 func (svc *Service) CreateSubmission(ctx context.Context, request *api.SubmissionCreate) (*api.ID, error) {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return nil, ErrUserInfo
 	}
@@ -205,7 +205,7 @@ func (svc *Service) ListSubmissions(ctx context.Context, params api.ListSubmissi
 //
 // POST /submissions/{SubmissionID}/completed
 func (svc *Service) SetSubmissionCompleted(ctx context.Context, params api.SetSubmissionCompletedParams) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return ErrUserInfo
 	}
@@ -230,7 +230,7 @@ func (svc *Service) SetSubmissionCompleted(ctx context.Context, params api.SetSu
 //
 // POST /submissions/{SubmissionID}/model
 func (svc *Service) UpdateSubmissionModel(ctx context.Context, params api.UpdateSubmissionModelParams) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return ErrUserInfo
 	}
@@ -265,7 +265,7 @@ func (svc *Service) UpdateSubmissionModel(ctx context.Context, params api.Update
 //
 // POST /submissions/{SubmissionID}/status/reject
 func (svc *Service) ActionSubmissionReject(ctx context.Context, params api.ActionSubmissionRejectParams) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return ErrUserInfo
 	}
@@ -291,7 +291,7 @@ func (svc *Service) ActionSubmissionReject(ctx context.Context, params api.Actio
 //
 // POST /submissions/{SubmissionID}/status/request-changes
 func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params api.ActionSubmissionRequestChangesParams) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return ErrUserInfo
 	}
@@ -317,7 +317,7 @@ func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params a
 //
 // POST /submissions/{SubmissionID}/status/revoke
 func (svc *Service) ActionSubmissionRevoke(ctx context.Context, params api.ActionSubmissionRevokeParams) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return ErrUserInfo
 	}
@@ -349,7 +349,7 @@ func (svc *Service) ActionSubmissionRevoke(ctx context.Context, params api.Actio
 //
 // POST /submissions/{SubmissionID}/status/submit
 func (svc *Service) ActionSubmissionSubmit(ctx context.Context, params api.ActionSubmissionSubmitParams) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return ErrUserInfo
 	}
@@ -381,7 +381,7 @@ func (svc *Service) ActionSubmissionSubmit(ctx context.Context, params api.Actio
 //
 // POST /submissions/{SubmissionID}/status/trigger-upload
 func (svc *Service) ActionSubmissionTriggerUpload(ctx context.Context, params api.ActionSubmissionTriggerUploadParams) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return ErrUserInfo
 	}
@@ -446,7 +446,7 @@ func (svc *Service) ActionSubmissionTriggerUpload(ctx context.Context, params ap
 //
 // POST /submissions/{SubmissionID}/status/reset-uploading
 func (svc *Service) ActionSubmissionValidated(ctx context.Context, params api.ActionSubmissionValidatedParams) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return ErrUserInfo
 	}
@@ -482,7 +482,7 @@ func (svc *Service) ActionSubmissionValidated(ctx context.Context, params api.Ac
 //
 // POST /submissions/{SubmissionID}/status/trigger-validate
 func (svc *Service) ActionSubmissionTriggerValidate(ctx context.Context, params api.ActionSubmissionTriggerValidateParams) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return ErrUserInfo
 	}
@@ -542,7 +542,7 @@ func (svc *Service) ActionSubmissionTriggerValidate(ctx context.Context, params
 //
 // POST /submissions/{SubmissionID}/status/reset-validating
 func (svc *Service) ActionSubmissionAccepted(ctx context.Context, params api.ActionSubmissionAcceptedParams) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return ErrUserInfo
 	}
@@ -579,7 +579,7 @@ func (svc *Service) ActionSubmissionAccepted(ctx context.Context, params api.Act
 //
 // POST /release-submissions
 func (svc *Service) ReleaseSubmissions(ctx context.Context, request []api.ReleaseInfo) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfo)
+	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return ErrUserInfo
 	}