4 files changed, 8 insertions, 8 deletions
diff --git a/src/algebra/strap/INT.lsp b/src/algebra/strap/INT.lsp
index 8ed6dc18..8e681337 100644
--- a/src/algebra/strap/INT.lsp
+++ b/src/algebra/strap/INT.lsp
@@ -70,7 +70,7 @@
 (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Shell|) |%Integer|)
                 |INT;length;2$;19|)) 
 
-(PUT '|INT;length;2$;19| '|SPADreplace| 'INTEGER-LENGTH) 
+(PUT '|INT;length;2$;19| '|SPADreplace| '|%ilength|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Integer| |%Integer| |%Integer| |%Shell|)
                     |%Integer|)
diff --git a/src/algebra/strap/OUTFORM.lsp b/src/algebra/strap/OUTFORM.lsp
index 8916bd73..af6c2e66 100644
--- a/src/algebra/strap/OUTFORM.lsp
+++ b/src/algebra/strap/OUTFORM.lsp
@@ -37,7 +37,7 @@
 (DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Boolean|)
                 |OUTFORM;=;2$B;9|)) 
 
-(PUT '|OUTFORM;=;2$B;9| '|SPADreplace| 'EQUAL) 
+(PUT '|OUTFORM;=;2$B;9| '|SPADreplace| '|%equal|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Thing|)
                 |OUTFORM;=;3$;10|)) 
diff --git a/src/algebra/strap/SINT.lsp b/src/algebra/strap/SINT.lsp
index a3c55e19..634d0e12 100644
--- a/src/algebra/strap/SINT.lsp
+++ b/src/algebra/strap/SINT.lsp
@@ -194,11 +194,13 @@
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Boolean|)
                 |SINT;zero?;$B;43|)) 
 
-(PUT '|SINT;zero?;$B;43| '|SPADreplace| 'QSZEROP) 
+(PUT '|SINT;zero?;$B;43| '|SPADreplace| '(XLAM (|x|) (|%ieq| |x| 0))) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Boolean|)
                 |SINT;one?;$B;44|)) 
 
+(PUT '|SINT;one?;$B;44| '|SPADreplace| '(XLAM (|x|) (|%ieq| |x| 1))) 
+
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;max;3$;45|)) 
 
@@ -217,7 +219,7 @@
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Shell|) |%Short|)
                 |SINT;length;2$;48|)) 
 
-(PUT '|SINT;length;2$;48| '|SPADreplace| 'INTEGER-LENGTH) 
+(PUT '|SINT;length;2$;48| '|SPADreplace| '|%ilength|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Short| |%Short| |%Shell|) |%Short|)
                 |SINT;shift;3$;49|)) 
@@ -287,8 +289,6 @@
 
 (PUT '|SINT;or;3$;24| '|SPADreplace| 'LOGIOR) 
 
-(PUT '|SINT;one?;$B;44| '|SPADreplace| '(XLAM (|x|) (|%ieq| |x| 1))) 
-
 (DEFUN |SINT;writeOMSingleInt| (|dev| |x| $)
   (SEQ (COND
          ((QSMINUSP |x|)
@@ -433,7 +433,7 @@
 
 (DEFUN |SINT;odd?;$B;42| (|x| $) (DECLARE (IGNORE $)) (ODDP |x|)) 
 
-(DEFUN |SINT;zero?;$B;43| (|x| $) (DECLARE (IGNORE $)) (QSZEROP |x|)) 
+(DEFUN |SINT;zero?;$B;43| (|x| $) (DECLARE (IGNORE $)) (ZEROP |x|)) 
 
 (DEFUN |SINT;one?;$B;44| (|x| $) (DECLARE (IGNORE $)) (EQL |x| 1)) 
 
diff --git a/src/algebra/strap/SYMBOL.lsp b/src/algebra/strap/SYMBOL.lsp
index 72bde704..71fd3a5c 100644
--- a/src/algebra/strap/SYMBOL.lsp
+++ b/src/algebra/strap/SYMBOL.lsp
@@ -31,7 +31,7 @@
 (DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Boolean|)
                 |SYMBOL;=;2$B;9|)) 
 
-(PUT '|SYMBOL;=;2$B;9| '|SPADreplace| 'EQUAL) 
+(PUT '|SYMBOL;=;2$B;9| '|SPADreplace| '|%equal|) 
 
 (DECLAIM (FTYPE (FUNCTION (|%Thing| |%Thing| |%Shell|) |%Boolean|)
                 |SYMBOL;<;2$B;10|))