diff --git a/src/hal/components/and.comp b/src/hal/components/and_n.comp
similarity index 65%
rename from src/hal/components/and.comp
rename to src/hal/components/and_n.comp
index e39571171e0..3d77862ea25 100644
--- a/src/hal/components/and.comp
+++ b/src/hal/components/and_n.comp
@@ -1,5 +1,5 @@
-component and "Multi input AND gate";
-pin in bool in##[128:personality] = 1 "input pins, up to personality-1";
+component and_n "Compute the logical AND of up to 255 inputs.";
+pin in bool in##[255:personality] = 1 "inputs (default is TRUE)";
 pin out bool out "output pin; the AND of all inputs";
 
 description """
@@ -7,24 +7,22 @@ The *out* pin is set to *TRUE* if all the inputs are all *TRUE*; or *FALSE* if o
 
 The value for a unconnected pin is TRUE; so it is fine to leave a pin unconnected. 
 
-Set the number of pins via personality.  The default value is a single *AND* with 8 inputs; so personality=8.  The maximum number of inputs is 128 (hardcoded). If there are no inputs specified (personality=0); then the output value
+Set the number of pins via personality.  The default value is a single *AND* with 8 
+inputs; so personality=8.  The maximum number of inputs is 255 (hardcoded). 
+If there are no inputs specified (personality=0); then the output value
 is TRUE.
 """;
 
 function _ "Logical AND";
 
 see_also """
-*or*(9),
-and2(9)
-and
-or2(9).
+or(9), and2(9) and or2(9).
 """;
 
 option period no;
 option default_personality 8;
-option default_count 1;
 
-license "ASLv2";
+license "GPL";
 author "Dirk-Willem van Gulik <dirkx(at)webweaving(punto)org";
 ;;
 FUNCTION(_) { 
diff --git a/src/hal/components/or.comp b/src/hal/components/or_n.comp
similarity index 67%
rename from src/hal/components/or.comp
rename to src/hal/components/or_n.comp
index c7b3ce11b2c..4da0cb1e899 100644
--- a/src/hal/components/or.comp
+++ b/src/hal/components/or_n.comp
@@ -1,5 +1,5 @@
-component or "Arbitrary input OR gate";
-pin in bool in##[128:personality] = 0 "in";
+component or_n "compute the logical OR of up to 255 inputs.";
+pin in bool in##[255:personality] = 0 "in (default is FALSE)";
 pin out bool out "output pin; the OR of all inputs";
 
 description """
@@ -7,9 +7,9 @@ The *out* pin is set to *TRUE* if any the inputs is *TRUE*; or *FALSE* if all ar
 
 The value for a unconnected pin is FALSE; so it is fine to leave a pin unconnected. 
 
-Set the number of pins via personality. The default value is a single *OR* with 8 inputs; so personality=8. The
-maximum number of inputs is 128 (hardcoded). If there are no input pins at all (personality=0); then 
-the output is *FALSE*.
+Set the number of pins via personality. The default value is a single *OR* with 8 
+inputs; so personality=8. The maximum number of inputs is 155(hardcoded). If there 
+are no input pins at all (personality=0); then the output is *FALSE*.
 """
 ;
 function _;
@@ -19,9 +19,8 @@ and(9), and2(9) and or2(9).
 
 option period no;
 option default_personality 8;
-option default_count 1;
 
-license "ASLv2";
+license "GPL";
 author "Dirk-Willem van Gulik <dirkx(at)webweaving(punto)org";
 ;;
 FUNCTION(_) {