diff --git a/api/agent_test.go b/api/agent_test.go
index f847b3ae1..82a8e93f8 100644
--- a/api/agent_test.go
+++ b/api/agent_test.go
@@ -306,8 +306,8 @@ func TestAgent_MonitorWithNode(t *testing.T) {
 	doneCh := make(chan struct{})
 	q := &QueryOptions{
 		Params: map[string]string{
-			"log-level": "debug",
-			"node-id":   node.ID,
+			"log_level": "debug",
+			"node_id":   node.ID,
 		},
 	}
 
@@ -345,7 +345,7 @@ func TestAgent_Monitor(t *testing.T) {
 
 	q := &QueryOptions{
 		Params: map[string]string{
-			"log-level": "debug",
+			"log_level": "debug",
 		},
 	}
 
diff --git a/client/agent_endpoint.go b/client/agent_endpoint.go
index e452837bd..e1b6e31ec 100644
--- a/client/agent_endpoint.go
+++ b/client/agent_endpoint.go
@@ -21,7 +21,7 @@ type Agent struct {
 	c *Client
 }
 
-func NewMonitorEndpoint(c *Client) *Agent {
+func NewAgentEndpoint(c *Client) *Agent {
 	m := &Agent{c: c}
 	m.c.streamingRpcs.Register("Agent.Monitor", m.monitor)
 	return m
@@ -50,11 +50,9 @@ func (m *Agent) monitor(conn io.ReadWriteCloser) {
 		return
 	}
 
-	var logLevel log.Level
+	logLevel := log.LevelFromString(args.LogLevel)
 	if args.LogLevel == "" {
 		logLevel = log.LevelFromString("INFO")
-	} else {
-		logLevel = log.LevelFromString(args.LogLevel)
 	}
 
 	if logLevel == log.NoLevel {
diff --git a/client/rpc.go b/client/rpc.go
index 6d15d831e..3388f6483 100644
--- a/client/rpc.go
+++ b/client/rpc.go
@@ -23,7 +23,7 @@ type rpcEndpoints struct {
 	ClientStats *ClientStats
 	FileSystem  *FileSystem
 	Allocations *Allocations
-	Monitor     *Agent
+	Agent       *Agent
 }
 
 // ClientRPC is used to make a local, client only RPC call
@@ -219,7 +219,7 @@ func (c *Client) setupClientRpc() {
 	c.endpoints.ClientStats = &ClientStats{c}
 	c.endpoints.FileSystem = NewFileSystemEndpoint(c)
 	c.endpoints.Allocations = NewAllocationsEndpoint(c)
-	c.endpoints.Monitor = NewMonitorEndpoint(c)
+	c.endpoints.Agent = NewAgentEndpoint(c)
 
 	// Create the RPC Server
 	c.rpcServer = rpc.NewServer()
diff --git a/command/agent/agent_endpoint.go b/command/agent/agent_endpoint.go
index c48feb50f..ceb16d8eb 100644
--- a/command/agent/agent_endpoint.go
+++ b/command/agent/agent_endpoint.go
@@ -166,7 +166,7 @@ func (s *HTTPServer) AgentMonitor(resp http.ResponseWriter, req *http.Request) (
 	}
 
 	// Get the provided loglevel.
-	logLevel := req.URL.Query().Get("log-level")
+	logLevel := req.URL.Query().Get("log_level")
 	if logLevel == "" {
 		logLevel = "INFO"
 	}
@@ -176,9 +176,9 @@ func (s *HTTPServer) AgentMonitor(resp http.ResponseWriter, req *http.Request) (
 	}
 
 	// Determine if we are targeting a server or client
-	nodeID := req.URL.Query().Get("node-id")
+	nodeID := req.URL.Query().Get("node_id")
 
-	logJSONStr := req.URL.Query().Get("log-json")
+	logJSONStr := req.URL.Query().Get("log_json")
 	logJSON, err := strconv.ParseBool(logJSONStr)
 	if err != nil {
 		logJSON = false
diff --git a/command/agent/agent_endpoint_test.go b/command/agent/agent_endpoint_test.go
index 0a4cb1f01..767801048 100644
--- a/command/agent/agent_endpoint_test.go
+++ b/command/agent/agent_endpoint_test.go
@@ -256,7 +256,7 @@ func TestHTTP_AgentMonitor(t *testing.T) {
 
 	httpTest(t, nil, func(s *TestAgent) {
 		{
-			req, err := http.NewRequest("GET", "/v1/agent/monitor?log-level=unknown", nil)
+			req, err := http.NewRequest("GET", "/v1/agent/monitor?log_level=unknown", nil)
 			require.Nil(t, err)
 			resp := newClosableRecorder()
 
@@ -269,7 +269,7 @@ func TestHTTP_AgentMonitor(t *testing.T) {
 
 		// check for a specific log
 		{
-			req, err := http.NewRequest("GET", "/v1/agent/monitor?log-level=warn", nil)
+			req, err := http.NewRequest("GET", "/v1/agent/monitor?log_level=warn", nil)
 			require.Nil(t, err)
 			resp := newClosableRecorder()
 			defer resp.Close()
@@ -304,7 +304,7 @@ func TestHTTP_AgentMonitor(t *testing.T) {
 
 		// stream logs for a given node
 		{
-			req, err := http.NewRequest("GET", "/v1/agent/monitor?log-level=warn&node-id="+s.client.NodeID(), nil)
+			req, err := http.NewRequest("GET", "/v1/agent/monitor?log_level=warn&node_id="+s.client.NodeID(), nil)
 			require.Nil(t, err)
 			resp := newClosableRecorder()
 			defer resp.Close()
diff --git a/command/agent_monitor.go b/command/agent_monitor.go
index 9b42562cd..c09c200da 100644
--- a/command/agent_monitor.go
+++ b/command/agent_monitor.go
@@ -80,9 +80,9 @@ func (c *MonitorCommand) Run(args []string) int {
 	}
 
 	params := map[string]string{
-		"log-level": logLevel,
-		"node-id":   nodeID,
-		"log-json":  strconv.FormatBool(logJSON),
+		"log_level": logLevel,
+		"node_id":   nodeID,
+		"log_json":  strconv.FormatBool(logJSON),
 	}
 
 	query := &api.QueryOptions{
diff --git a/nomad/client_agent_endpoint.go b/nomad/client_agent_endpoint.go
index 12a0d0857..6c9370653 100644
--- a/nomad/client_agent_endpoint.go
+++ b/nomad/client_agent_endpoint.go
@@ -47,11 +47,9 @@ func (m *Agent) monitor(conn io.ReadWriteCloser) {
 		return
 	}
 
-	var logLevel log.Level
+	logLevel := log.LevelFromString(args.LogLevel)
 	if args.LogLevel == "" {
 		logLevel = log.LevelFromString("INFO")
-	} else {
-		logLevel = log.LevelFromString(args.LogLevel)
 	}
 
 	if logLevel == log.NoLevel {