diff --git a/src/agreements_api.go b/src/agreements_api.go
index 37f499b..aa3428f 100644
--- a/src/agreements_api.go
+++ b/src/agreements_api.go
@@ -218,7 +218,7 @@ func (e mainEnv) agreementRevokeAll(w http.ResponseWriter, r *http.Request, ps h
 	w.Write([]byte(`{"status":"ok"}`))
 }
 
-func (e mainEnv) getUserAgreements(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) agreementListForUser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	identity := ps.ByName("identity")
 	mode := ps.ByName("mode")
 	event := audit.CreateAuditEvent("get agreements for "+mode, identity, mode, identity)
@@ -247,7 +247,7 @@ func (e mainEnv) getUserAgreements(w http.ResponseWriter, r *http.Request, ps ht
 	w.Write([]byte(str))
 }
 
-func (e mainEnv) getUserAgreement(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) agreementGet(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	identity := ps.ByName("identity")
 	brief := ps.ByName("brief")
 	mode := ps.ByName("mode")
diff --git a/src/audit_api.go b/src/audit_api.go
index 20d5b2f..b980e7a 100644
--- a/src/audit_api.go
+++ b/src/audit_api.go
@@ -68,7 +68,7 @@ func (e mainEnv) EnforceAdmin(w http.ResponseWriter, r *http.Request, event *aud
 	return ""
 }
 
-func (e mainEnv) getAuditEvents(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) auditEventListForUser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	userTOKEN := ps.ByName("token")
 	event := audit.CreateAuditEvent("view audit events", userTOKEN, "token", userTOKEN)
 	defer func() { SaveAuditEvent(event, e.db, e.conf) }()
@@ -99,7 +99,7 @@ func (e mainEnv) getAuditEvents(w http.ResponseWriter, r *http.Request, ps httpr
 	w.Write([]byte(str))
 }
 
-func (e mainEnv) getAdminAuditEvents(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) auditEventList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	if e.EnforceAdmin(w, r, nil) == "" {
 		return
 	}
@@ -124,7 +124,7 @@ func (e mainEnv) getAdminAuditEvents(w http.ResponseWriter, r *http.Request, ps
 	w.Write([]byte(str))
 }
 
-func (e mainEnv) getAuditEvent(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) auditEventGet(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	atoken := ps.ByName("atoken")
 	event := audit.CreateAuditEvent("view audit event", atoken, "token", atoken)
 	defer func() { SaveAuditEvent(event, e.db, e.conf) }()
diff --git a/src/bunker.go b/src/bunker.go
index 53689fe..80aabd7 100644
--- a/src/bunker.go
+++ b/src/bunker.go
@@ -219,14 +219,14 @@ func (e mainEnv) setupRouter() *httprouter.Router {
 	router.POST("/v1/exp/start/:mode/:identity", e.expStart)
 	router.DELETE("/v1/exp/cancel/:mode/:identity", e.expCancel)
 
-	router.POST("/v1/sharedrecord/:mode/:identity", e.newSharedRecord)
-	router.GET("/v1/get/:record", e.getRecord)
+	router.POST("/v1/sharedrecord/:mode/:identity", e.sharedRecordCreate)
+	router.GET("/v1/get/:record", e.sharedRecordGet)
 
-	router.GET("/v1/request/:request", e.getUserRequest)
-	router.POST("/v1/request/:request", e.approveUserRequest)
-	router.DELETE("/v1/request/:request", e.cancelUserRequest)
-	router.GET("/v1/requests/:mode/:identity", e.getCustomUserRequests)
-	router.GET("/v1/requests", e.getUserRequests)
+	router.GET("/v1/request/:request", e.userReqGet)
+	router.POST("/v1/request/:request", e.userReqApprove)
+	router.DELETE("/v1/request/:request", e.userReqCancel)
+	router.GET("/v1/requests/:mode/:identity", e.userReqListForUser)
+	router.GET("/v1/requests", e.userReqList)
 
 	router.GET("/v1/pactivity", e.pactivityList)
 	router.POST("/v1/pactivity/:activity", e.pactivityCreate)
@@ -234,37 +234,37 @@ func (e mainEnv) setupRouter() *httprouter.Router {
 	router.POST("/v1/pactivity/:activity/:brief", e.pactivityLink)
 	router.DELETE("/v1/pactivity/:activity/:brief", e.pactivityUnlink)
 
-	router.GET("/v1/lbasis", e.listLegalBasisRecords)
-	router.POST("/v1/lbasis/:brief", e.createLegalBasis)
-	router.DELETE("/v1/lbasis/:brief", e.deleteLegalBasis)
+	router.GET("/v1/lbasis", e.legalBasisList)
+	router.POST("/v1/lbasis/:brief", e.legalBasisCreate)
+	router.DELETE("/v1/lbasis/:brief", e.legalBasisDelete)
 
-	router.GET("/v1/agreement/:brief/:mode/:identity", e.getUserAgreement)
+	router.GET("/v1/agreement/:brief/:mode/:identity", e.agreementGet)
 	router.POST("/v1/agreement/:brief/:mode/:identity", e.agreementAccept)
 	router.DELETE("/v1/agreement/:brief", e.agreementRevokeAll)
 	router.DELETE("/v1/agreement/:brief/:mode/:identity", e.agreementWithdraw)
-	router.GET("/v1/agreements/:mode/:identity", e.getUserAgreements)
+	router.GET("/v1/agreements/:mode/:identity", e.agreementListForUser)
 
 	//router.GET("/v1/consent/:mode/:identity", e.consentAllUserRecords)
 	//router.GET("/v1/consent/:mode/:identity/:brief", e.consentUserRecord)
 
-	router.POST("/v1/userapp/:mode/:identity/:appname", e.userappNew)
+	router.POST("/v1/userapp/:mode/:identity/:appname", e.userappCreate)
 	router.GET("/v1/userapp/:mode/:identity/:appname", e.userappGet)
 	router.PUT("/v1/userapp/:mode/:identity/:appname", e.userappChange)
 	router.DELETE("/v1/userapp/:mode/:identity/:appname", e.userappDelete)
-	router.GET("/v1/userapp/:mode/:identity", e.userappList)
-	router.GET("/v1/userapps", e.appList)
+	router.GET("/v1/userapp/:mode/:identity", e.userappListForUser)
+	router.GET("/v1/userapps", e.userappList)
 
-	router.GET("/v1/session/:session", e.getSession)
-	router.POST("/v1/session/:session", e.createSession)
-	router.DELETE("/v1/session/:session", e.deleteSession)
-	//router.POST("/v1/sessions/:mode/:identity", e.newUserSession)
-	router.GET("/v1/sessions/:mode/:identity", e.getUserSessions)
+	router.GET("/v1/session/:session", e.sessionGet)
+	router.POST("/v1/session/:session", e.sessionCreate)
+	router.DELETE("/v1/session/:session", e.sessionDelete)
+	//router.POST("/v1/sessions/:mode/:identity", e.sessionNewOld)
+	router.GET("/v1/sessions/:mode/:identity", e.sessionListForUser)
 
 	router.GET("/v1/metrics", e.metrics)
 
-	router.GET("/v1/audit/admin", e.getAdminAuditEvents)
-	router.GET("/v1/audit/list/:token", e.getAuditEvents)
-	router.GET("/v1/audit/get/:atoken", e.getAuditEvent)
+	router.GET("/v1/audit/admin", e.auditEventList)
+	router.GET("/v1/audit/list/:token", e.auditEventListForUser)
+	router.GET("/v1/audit/get/:atoken", e.auditEventGet)
 
 	router.GET("/v1/captcha/:code", e.showCaptcha)
 
diff --git a/src/lbasis_api.go b/src/lbasis_api.go
index 8be96f5..3b1fe3f 100644
--- a/src/lbasis_api.go
+++ b/src/lbasis_api.go
@@ -10,7 +10,7 @@ import (
 	//"go.mongodb.org/mongo-driver/bson"
 )
 
-func (e mainEnv) createLegalBasis(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) legalBasisCreate(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	brief := ps.ByName("brief")
 	if e.EnforceAdmin(w, r, nil) == "" {
 		return
@@ -80,7 +80,7 @@ func (e mainEnv) createLegalBasis(w http.ResponseWriter, r *http.Request, ps htt
 	w.Write([]byte(`{"status":"ok"}`))
 }
 
-func (e mainEnv) deleteLegalBasis(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) legalBasisDelete(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	brief := ps.ByName("brief")
 	if e.EnforceAdmin(w, r, nil) == "" {
 		return
@@ -97,7 +97,7 @@ func (e mainEnv) deleteLegalBasis(w http.ResponseWriter, r *http.Request, ps htt
 	w.Write([]byte(`{"status":"ok"}`))
 }
 
-func (e mainEnv) listLegalBasisRecords(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) legalBasisList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	if e.EnforceAdmin(w, r, nil) == "" {
 		return
 	}
diff --git a/src/requests_api.go b/src/requests_api.go
index b310504..d152079 100644
--- a/src/requests_api.go
+++ b/src/requests_api.go
@@ -12,7 +12,7 @@ import (
 )
 
 // This function retrieves all requests that require admin approval. This function supports result pager.
-func (e mainEnv) getUserRequests(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) userReqList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	event := audit.CreateAuditEvent("view user requests", "", "", "")
 	if e.EnforceAdmin(w, r, event) == "" {
 		return
@@ -42,7 +42,7 @@ func (e mainEnv) getUserRequests(w http.ResponseWriter, r *http.Request, ps http
 }
 
 // Get list of requests for specific user
-func (e mainEnv) getCustomUserRequests(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) userReqListForUser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	identity := ps.ByName("identity")
 	mode := ps.ByName("mode")
 	event := audit.CreateAuditEvent("get user privacy requests", identity, mode, identity)
@@ -73,7 +73,7 @@ func (e mainEnv) getCustomUserRequests(w http.ResponseWriter, r *http.Request, p
 	w.Write([]byte(str))
 }
 
-func (e mainEnv) getUserRequest(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) userReqGet(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	request := ps.ByName("request")
 	event := audit.CreateAuditEvent("get user request by request token", request, "request", request)
 	defer func() { SaveAuditEvent(event, e.db, e.conf) }()
@@ -153,7 +153,7 @@ func (e mainEnv) getUserRequest(w http.ResponseWriter, r *http.Request, ps httpr
 	w.Write([]byte(str))
 }
 
-func (e mainEnv) approveUserRequest(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) userReqApprove(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	request := ps.ByName("request")
 	event := audit.CreateAuditEvent("approve user request", request, "request", request)
 	defer func() { SaveAuditEvent(event, e.db, e.conf) }()
@@ -251,9 +251,6 @@ func (e mainEnv) approveUserRequest(w http.ResponseWriter, r *http.Request, ps h
 		mode := "token"
 		lastmodifiedby := "admin"
 		e.db.withdrawAgreement(userTOKEN, brief, mode, userTOKEN, lastmodifiedby)
-	} else if action == "plugin-delete" {
-		pluginid := requestInfo["brief"].(string)
-		e.pluginUserDelete(pluginid, userTOKEN)
 	}
 
 	e.db.updateRequestStatus(request, "approved", reason)
@@ -262,7 +259,7 @@ func (e mainEnv) approveUserRequest(w http.ResponseWriter, r *http.Request, ps h
 	fmt.Fprintf(w, `{"status":"ok","result":"done"}`)
 }
 
-func (e mainEnv) cancelUserRequest(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) userReqCancel(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	request := ps.ByName("request")
 	event := audit.CreateAuditEvent("cancel user request", request, "request", request)
 	defer func() { SaveAuditEvent(event, e.db, e.conf) }()
diff --git a/src/sessions_api.go b/src/sessions_api.go
index 00ca0d5..292863a 100644
--- a/src/sessions_api.go
+++ b/src/sessions_api.go
@@ -14,7 +14,7 @@ import (
 	"github.com/securitybunker/databunker/src/utils"
 )
 
-func (e mainEnv) createSession(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) sessionCreate(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	session := ps.ByName("session")
 	var event *audit.AuditEvent
 	defer func() {
@@ -84,7 +84,7 @@ func (e mainEnv) createSession(w http.ResponseWriter, r *http.Request, ps httpro
 	fmt.Fprintf(w, `{"status":"ok","session":"%s"}`, session)
 }
 
-func (e mainEnv) deleteSession(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) sessionDelete(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	session := ps.ByName("session")
 	event := audit.CreateAuditEvent("delete session", session, "session", session)
 	defer func() { SaveAuditEvent(event, e.db, e.conf) }()
@@ -102,7 +102,7 @@ func (e mainEnv) deleteSession(w http.ResponseWriter, r *http.Request, ps httpro
 }
 
 // the following function is currently not used
-func (e mainEnv) newUserSession(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) sessionNewOld(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	identity := ps.ByName("identity")
 	mode := ps.ByName("mode")
 	event := audit.CreateAuditEvent("create user session by "+mode, identity, mode, identity)
@@ -144,7 +144,7 @@ func (e mainEnv) newUserSession(w http.ResponseWriter, r *http.Request, ps httpr
 	fmt.Fprintf(w, `{"status":"ok","session":"%s"}`, sessionID)
 }
 
-func (e mainEnv) getUserSessions(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) sessionListForUser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	identity := ps.ByName("identity")
 	mode := ps.ByName("mode")
 	event := audit.CreateAuditEvent("get all user sessions", identity, mode, identity)
@@ -176,7 +176,7 @@ func (e mainEnv) getUserSessions(w http.ResponseWriter, r *http.Request, ps http
 	fmt.Fprintf(w, `{"status":"ok","total":%d,"rows":[%s]}`, count, data)
 }
 
-func (e mainEnv) getSession(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) sessionGet(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	session := ps.ByName("session")
 	event := audit.CreateAuditEvent("get session", session, "session", session)
 	defer func() {
diff --git a/src/sharedrecords_api.go b/src/sharedrecords_api.go
index df0f587..3b64a74 100644
--- a/src/sharedrecords_api.go
+++ b/src/sharedrecords_api.go
@@ -14,7 +14,7 @@ import (
 	"github.com/tidwall/gjson"
 )
 
-func (e mainEnv) newSharedRecord(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) sharedRecordCreate(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	identity := ps.ByName("identity")
 	mode := ps.ByName("mode")
 	event := audit.CreateAuditEvent("create shareable record by "+mode, identity, "token", identity)
@@ -65,7 +65,7 @@ func (e mainEnv) newSharedRecord(w http.ResponseWriter, r *http.Request, ps http
 	fmt.Fprintf(w, `{"status":"ok","record":%q}`, recordUUID)
 }
 
-func (e mainEnv) getRecord(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) sharedRecordGet(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	record := ps.ByName("record")
 	event := audit.CreateAuditEvent("get shareable record by token", record, "record", record)
 	defer func() { SaveAuditEvent(event, e.db, e.conf) }()
diff --git a/src/userapps_api.go b/src/userapps_api.go
index bb26f8c..1810b5b 100644
--- a/src/userapps_api.go
+++ b/src/userapps_api.go
@@ -11,7 +11,7 @@ import (
 	"github.com/securitybunker/databunker/src/utils"
 )
 
-func (e mainEnv) userappNew(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) userappCreate(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	appName := strings.ToLower(ps.ByName("appname"))
 	identity := ps.ByName("identity")
 	mode := ps.ByName("mode")
@@ -122,7 +122,7 @@ func (e mainEnv) userappChange(w http.ResponseWriter, r *http.Request, ps httpro
 	fmt.Fprintf(w, `{"status":"ok","result":"%s","rtoken":"%s"}`, rstatus, rtoken)
 }
 
-func (e mainEnv) userappList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) userappListForUser(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	identity := ps.ByName("identity")
 	mode := ps.ByName("mode")
 	event := audit.CreateAuditEvent("get user app list by "+mode, identity, mode, identity)
@@ -197,7 +197,7 @@ func (e mainEnv) userappDelete(w http.ResponseWriter, r *http.Request, ps httpro
 	w.Write([]byte(finalJSON))
 }
 
-func (e mainEnv) appList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
+func (e mainEnv) userappList(w http.ResponseWriter, r *http.Request, ps httprouter.Params) {
 	if e.EnforceAuth(w, r, nil) == "" {
 		return
 	}
diff --git a/version.txt b/version.txt
index 663a808..d076386 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-0.8.30
+0.8.31