diff --git a/hcl/json/navigation.go b/hcl/json/navigation.go
index d28e603..307eebb 100644
--- a/hcl/json/navigation.go
+++ b/hcl/json/navigation.go
@@ -8,7 +8,7 @@ type navigation struct {
 	root *objectVal
 }
 
-// Implementation of zcled.ContextString
+// Implementation of hcled.ContextString
 func (n navigation) ContextString(offset int) string {
 	steps := navigationStepsRev(n.root, offset)
 	if steps == nil {
diff --git a/hcl/json/parser.go b/hcl/json/parser.go
index 41d05fb..f36625e 100644
--- a/hcl/json/parser.go
+++ b/hcl/json/parser.go
@@ -168,7 +168,7 @@ Token:
 			}
 
 			if colon.Type == tokenEquals {
-				// Possible confusion with native zcl syntax.
+				// Possible confusion with native HCL syntax.
 				return nil, diags.Append(&hcl.Diagnostic{
 					Severity: hcl.DiagError,
 					Summary:  "Missing attribute value colon",
diff --git a/hcl/json/public.go b/hcl/json/public.go
index 27d4c5c..04ee914 100644
--- a/hcl/json/public.go
+++ b/hcl/json/public.go
@@ -9,10 +9,10 @@ import (
 )
 
 // Parse attempts to parse the given buffer as JSON and, if successful, returns
-// a hcl.File for the zcl configuration represented by it.
+// a hcl.File for the HCL configuration represented by it.
 //
 // This is not a generic JSON parser. Instead, it deals only with the profile
-// of JSON used to express zcl configuration.
+// of JSON used to express HCL configuration.
 //
 // The returned file is valid only if the returned diagnostics returns false
 // from its HasErrors method. If HasErrors returns true, the file represents
diff --git a/hcl/json/structure.go b/hcl/json/structure.go
index 2899382..fc9f580 100644
--- a/hcl/json/structure.go
+++ b/hcl/json/structure.go
@@ -260,7 +260,7 @@ func (e *expression) Value(ctx *hcl.EvalContext) (cty.Value, hcl.Diagnostics) {
 	switch v := e.src.(type) {
 	case *stringVal:
 		if ctx != nil {
-			// Parse string contents as a zcl native language expression.
+			// Parse string contents as a HCL native language expression.
 			// We only do this if we have a context, so passing a nil context
 			// is how the caller specifies that interpolations are not allowed
 			// and that the string should just be returned verbatim.
@@ -288,8 +288,6 @@ func (e *expression) Value(ctx *hcl.EvalContext) (cty.Value, hcl.Diagnostics) {
 			return val, diags
 		}
 
-		// FIXME: Once the native zcl template language parser is implemented,
-		// parse string values as templates and evaluate them.
 		return cty.StringVal(v.Value), nil
 	case *numberVal:
 		return cty.NumberVal(v.Value), nil