diff --git a/.pi/extensions/pigibrack/index.ts b/.pi/extensions/pigibrack/index.ts
index 4fc9d2c..cf67922 100644
--- a/.pi/extensions/pigibrack/index.ts
+++ b/.pi/extensions/pigibrack/index.ts
@@ -265,12 +265,12 @@ function extractFormName(formText: string): string | undefined {
   if (!trimmed.startsWith('(')) return undefined;
 
   const patterns = [
-    /^\(\s*(?:define|define-public|define\*)\s+\(([\w!$%&*+\-./:<=>?@^~]+(?:[\w!$%&*+\-./:<=>?@^~]|#[^\s()\[\]]*)?)\b/,
-    /^\(\s*(?:define|define-public|define\*)\s+([^\s()\[\]]+)\b/,
-    /^\(\s*(?:define-syntax|define-syntax-rule|define-macro)\s+\(([^\s()\[\]]+)\b/,
-    /^\(\s*(?:define-syntax|define-syntax-rule|define-macro)\s+([^\s()\[\]]+)\b/,
-    /^\(\s*define-record-type\s+([^\s()\[\]]+)\b/,
-    /^\(\s*define-class\s+([^\s()\[\]]+)\b/,
+    /^\(\s*(?:define|define-public|define\*)\s+\(([^\s()\[\]]+)/,
+    /^\(\s*(?:define|define-public|define\*)\s+([^\s()\[\]]+)/,
+    /^\(\s*(?:define-syntax|define-syntax-rule|define-macro)\s+\(([^\s()\[\]]+)/,
+    /^\(\s*(?:define-syntax|define-syntax-rule|define-macro)\s+([^\s()\[\]]+)/,
+    /^\(\s*define-record-type\s+([^\s()\[\]]+)/,
+    /^\(\s*define-class\s+([^\s()\[\]]+)/,
   ];
 
   for (const pattern of patterns) {