diff --git a/src/kernel_services/ast_printing/cil_printer.ml b/src/kernel_services/ast_printing/cil_printer.ml
index 4f2086820465ed9970f1e619f698fbb511de748d..611431bf0239b02bcf18ea472fca5be39e3bc526 100644
--- a/src/kernel_services/ast_printing/cil_printer.ml
+++ b/src/kernel_services/ast_printing/cil_printer.ml
@@ -2727,9 +2727,8 @@ class cil_printer () = object (self)
   method logic_name fmt a =
     try
       let prefix = Stack.top module_stack in
-      match Extlib.string_del_prefix prefix a with
-      | Some x -> pp_print_string fmt x
-      | None -> self#varname fmt a
+      let shortname = Extlib.string_del_prefix prefix a in
+      self#varname fmt @@ Option.value ~default:a shortname
     with Stack.Empty ->
       self#varname fmt a