diff --git a/service/dap/server.go b/service/dap/server.go
index a8e7b343..a0b65834 100644
--- a/service/dap/server.go
+++ b/service/dap/server.go
@@ -525,7 +525,7 @@ func (s *Session) ServeDAPCodec() {
 		// potentially got some new DAP request that we do not yet have
 		// decoding support for, so we can respond with an ErrorResponse.
 		//
-		// Other errors, such as unmarshalling errors, will log the error and cause the server to trigger
+		// Other errors, such as unmarshaling errors, will log the error and cause the server to trigger
 		// a stop.
 		if err != nil {
 			s.config.log.Debug("DAP error: ", err)
@@ -588,7 +588,7 @@ func (s *Session) handleRequest(request dap.Message) {
 		return
 	}
 
-	// These requests, can be handled regardless of whether the targret is running
+	// These requests, can be handled regardless of whether the target is running
 	switch request := request.(type) {
 	case *dap.InitializeRequest: // Required
 		s.onInitializeRequest(request)
diff --git a/service/dap/server_test.go b/service/dap/server_test.go
index c2d8dfeb..7b818a6f 100644
--- a/service/dap/server_test.go
+++ b/service/dap/server_test.go
@@ -2147,7 +2147,7 @@ func TestVariablesLoading(t *testing.T) {
 						checkChildren(t, tm, "tm", 1)
 						ref = checkVarExact(t, tm, 0, "v", "tm.v", "[]map[string]main.astruct len: 1, cap: 1, [[...]]", "[]map[string]main.astruct", hasChildren)
 						if ref > 0 {
-							// Auto-loading of fully missing map chidlren happens here, but they get truncated at MaxArrayValuess
+							// Auto-loading of fully missing map chidlren happens here, but they get truncated at MaxArrayValues
 							client.VariablesRequest(ref)
 							tmV := client.ExpectVariablesResponse(t)
 							checkChildren(t, tmV, "tm.v", 1)
diff --git a/service/dap/types.go b/service/dap/types.go
index aa5bbab6..c7aed4a2 100644
--- a/service/dap/types.go
+++ b/service/dap/types.go
@@ -239,7 +239,7 @@ type AttachConfig struct {
 	LaunchAttachCommonConfig
 }
 
-// unmarshalLaunchAttachArgs wraps unmarshalling of launch/attach request's
+// unmarshalLaunchAttachArgs wraps unmarshaling of launch/attach request's
 // arguments attribute. Upon unmarshal failure, it returns an error massaged
 // to be suitable for end-users.
 func unmarshalLaunchAttachArgs(input json.RawMessage, config interface{}) error {