diff --git a/gapis/api/gles/gles.api b/gapis/api/gles/gles.api
index e6398e5875..caa8bc1e83 100644
--- a/gapis/api/gles/gles.api
+++ b/gapis/api/gles/gles.api
@@ -53,21 +53,28 @@ sub void supportsBits(GLbitfield seenBits, GLbitfield validBits) {
   if (seenBits & validBits) != seenBits { glErrorInvalidValue() }
 }
 
-sub void glErrorInvalidEnum(GLenum param) {
+sub void glErrorInvalidEnum(GLenum value) {
+  glErrorInvalidEnumMsg(new!ERR_INVALID_ENUM(value: as!u32(value)))
+}
+
+sub void glErrorInvalidEnumMsg(message m) {
   onGlError(GL_INVALID_ENUM)
-  // TODO: be more specific in callers
-  _ = newMsg(SEVERITY_ERROR, new!ERR_INVALID_ENUM_VALUE(value: 0,variable:  "variable"))
+  _ = newMsg(SEVERITY_ERROR, m)
   abort
 }
 
 sub void glErrorInvalidValue() {
+  glErrorInvalidValueMsg(new!ERR_INVALID_VALUE())
+}
+
+sub void glErrorInvalidValueMsg(message m) {
   onGlError(GL_INVALID_VALUE)
-  _ = newMsg(SEVERITY_ERROR, new!ERR_INVALID_VALUE(value: "value",variable:  "variable"))
+  _ = newMsg(SEVERITY_ERROR, m)
   abort
 }
 
 sub void glErrorInvalidOperation() {
-  glErrorInvalidOperationMsg(new!ERR_INVALID_OPERATION(operation: "operation"))
+  glErrorInvalidOperationMsg(new!ERR_INVALID_OPERATION())
 }
 
 sub void glErrorInvalidOperationMsg(message m) {
@@ -76,12 +83,6 @@ sub void glErrorInvalidOperationMsg(message m) {
   abort
 }
 
-sub void glErrorInvalidValueMsg(message m) {
-  onGlError(GL_INVALID_VALUE)
-  _ = newMsg(SEVERITY_ERROR, m)
-  abort
-}
-
 sub T max!T(T a, T b) {
   return switch a > b {
     case true:  a
diff --git a/gapis/messages/en-us.stb.md b/gapis/messages/en-us.stb.md
index 60e3715097..347e9c1cf6 100644
--- a/gapis/messages/en-us.stb.md
+++ b/gapis/messages/en-us.stb.md
@@ -25,15 +25,15 @@ The slice {{from_value}}:{{to_value}} for {{from_variable}}:{{to_variable}} is o
 
 # ERR_INVALID_VALUE
 
-Invalid value {{value}} for {{variable}}.
+Invalid value.
 
-# ERR_INVALID_ENUM_VALUE
+# ERR_INVALID_ENUM
 
-Invalid enum value {{value:u32}} for {{variable:string}}.
+Invalid enum {{value:u32}}.
 
 # ERR_INVALID_OPERATION
 
-Invalid operation: {{operation}}.
+Invalid operation.
 
 # ERR_CONTEXT_DOES_NOT_EXIST
 
diff --git a/gapis/resolve/framebuffer_attachment_data.go b/gapis/resolve/framebuffer_attachment_data.go
index 454224a105..2e7ecd95f5 100644
--- a/gapis/resolve/framebuffer_attachment_data.go
+++ b/gapis/resolve/framebuffer_attachment_data.go
@@ -56,7 +56,7 @@ func (r *FramebufferAttachmentBytesResolvable) Resolve(ctx context.Context) (int
 	case service.WireframeMode_Overlay:
 		wireframeMode = replay.WireframeMode_Overlay
 	default:
-		return nil, &service.ErrInvalidArgument{Reason: messages.ErrInvalidEnumValue(wireframeMode, "WireframeMode")}
+		return nil, &service.ErrInvalidArgument{Reason: messages.ErrInvalidEnum(wireframeMode)}
 	}
 
 	mgr := replay.GetManager(ctx)