diff --git a/src/applications/project/controller/PhabricatorProjectColumnDetailController.php b/src/applications/project/controller/PhabricatorProjectColumnDetailController.php
--- a/src/applications/project/controller/PhabricatorProjectColumnDetailController.php
+++ b/src/applications/project/controller/PhabricatorProjectColumnDetailController.php
@@ -100,7 +100,16 @@
     } else {
       $limit_text = $limit;
     }
-    $properties->addProperty(pht('Point Limit'), $limit_text);
+
+    // The "limit" has always had a dual purpose.
+    // Let's make it more obvious.
+    if (ManiphestTaskPoints::getIsEnabled()) {
+      $limit_label = pht('Point Limit');
+    } else {
+      $limit_label = pht('Count Limit');
+    }
+
+    $properties->addProperty($limit_label, $limit_text);
 
     $box = id(new PHUIObjectBoxView())
       ->setHeaderText(pht('Details'))
diff --git a/src/applications/project/controller/PhabricatorProjectColumnEditController.php b/src/applications/project/controller/PhabricatorProjectColumnEditController.php
--- a/src/applications/project/controller/PhabricatorProjectColumnEditController.php
+++ b/src/applications/project/controller/PhabricatorProjectColumnEditController.php
@@ -167,14 +167,24 @@
           ->setError($e_milestone_name));
     }
 
+    // The "limit" has always had a dual purpose.
+    // Let's make it more obvious.
+    if (ManiphestTaskPoints::getIsEnabled()) {
+      $limit_label = pht('Point Limit');
+      $limit_caption =
+        pht('Maximum number of points of tasks allowed in the column.');
+    } else {
+      $limit_label = pht('Count Limit');
+      $limit_caption = pht('Maximum number of tasks allowed in the column.');
+    }
+
     $form->appendChild(
       id(new AphrontFormTextControl())
         ->setValue($v_limit)
-        ->setLabel(pht('Point Limit'))
+        ->setLabel($limit_label)
         ->setName('limit')
         ->setError($e_limit)
-        ->setCaption(
-          pht('Maximum number of points of tasks allowed in the column.')));
+        ->setCaption($limit_caption));
 
     if ($is_new) {
       $title = pht('Create Column');