diff --git a/include/application.php b/include/application.php
index 2a1a704..75a12e2 100644
--- a/include/application.php
+++ b/include/application.php
@@ -225,7 +225,7 @@ class Application {
                 return false;
             $oVendorBefore = new Vendor($oApp->iVendorId);
             $oVendorAfter = new Vendor($this->iVendorId);
-            $sWhatChanged .= "Vendor was changed from ".$oVendorBefore->sName." to ".$oVendorAfter->sName.".\n\n";
+            $sWhatChanged .= "Developer was changed from ".$oVendorBefore->sName." to ".$oVendorAfter->sName.".\n\n";
         }
 
         if ($this->iCatId && ($this->iCatId!=$oApp->iCatId))
@@ -594,7 +594,7 @@ class Application {
                 if($this->iSubmitterId != $_SESSION['current']->iUserId)
                 {
                     $sVendorHelp .= "The user added a new one; review ".
-                                    "it in the vendor form below or ". 
+                                    "it in the Developer form below or ". 
                                     "replace it with an existing one.";
                 } else
                 {
@@ -605,7 +605,7 @@ class Application {
             }
         }
         // vendor name
-        echo '<tr valign=top><td class="color0"><b>Vendor</b></td>',"\n";
+        echo '<tr valign=top><td class="color0"><b>Developer</b></td>',"\n";
         echo "<td>$sVendorHelp</td></tr>\n";
 
         // alt vendor
@@ -672,7 +672,7 @@ class Application {
 
         // No vendor entered, and nothing in the list is selected
         if (empty($aValues['sVendorName']) && !$aValues['iAppVendorId'])
-            $errors .= "<li>Please enter a vendor.</li>\n";
+            $errors .= "<li>Please enter a developer.</li>\n";
 
         if (empty($aValues['shAppDescription']))
             $errors .= "<li>Please enter a description of your application.</li>\n";
@@ -763,7 +763,7 @@ class Application {
         $oCategory = new Category($this->iCatId);
         $oCategory->display($this->iAppId);
 
-        // set Vendor
+        // set developer
         $oVendor = new Vendor($this->iVendorId);
 
         // set URL
@@ -777,7 +777,7 @@ class Application {
 
         echo '      <table width="250" border="0" cellpadding="3" cellspacing="1">',"\n";
         echo "        <tr class=color0 valign=top><td width=\"100\"><b>Name</b></td><td width='100%'> ".$this->sName." </td>\n";
-        echo "        <tr class=\"color1\"><td><b>Vendor</b></td><td> ".
+        echo "        <tr class=\"color1\"><td><b>Developer</b></td><td> ".
             $oVendor->objectMakeLink()."&nbsp;\n";
         echo "        </td></tr>\n";
     
@@ -792,7 +792,7 @@ class Application {
         $img = Screenshot::get_random_screenshot_img($this->iAppId, null, false);
         echo "<tr><td align=\"center\" colspan=\"2\">$img</td></tr>\n";
 
-        echo "      </table>\n"; /* close of name/vendor/bugs/url table */
+        echo "      </table>\n"; /* close of name/developer/bugs/url table */
 
         echo "    </td></tr>\n";
         echo "    <tr><td>\n";
@@ -916,7 +916,7 @@ class Application {
         $oTableRow = new TableRow();
         $oTableRow->AddTextCell("Application");
         $oTableRow->AddTextCell("Description");
-        $oTableRow->AddTextCell("Vendor");
+        $oTableRow->AddTextCell("Developer");
         $oTableRow->AddTextCell("Submission Date");
         $oTableRow->SetClass("color4");
         $oTable->SetHeader($oTableRow);
@@ -1130,7 +1130,7 @@ class Application {
 
             /* Only show submitter when processing queued entries */
             $oTableRow->AddTextCell('Submitter');
-            $oTableRow->AddSortableTextCell('Vendor', 'vendorName');
+            $oTableRow->AddSortableTextCell('Developer', 'vendorName');
             $oTableRow->AddSortableTextCell('Application', 'appName');
         }
         return $oTableRow;
diff --git a/include/application_queue.php b/include/application_queue.php
index a3de51b..44d4901 100644
--- a/include/application_queue.php
+++ b/include/application_queue.php
@@ -221,7 +221,7 @@ class application_queue
                are processing an application and the vendor is queued */
             if(!$this->oApp->iAppId || $this->oVendor->objectGetState() != 'accepted')
             {
-                echo html_frame_start("New Vendor", "90%");
+                echo html_frame_start("New Developer", "90%");
                 $this->oVendor->outputEditor();
                 echo html_frame_end();
             }
diff --git a/include/vendor.php b/include/vendor.php
index e85966a..6242978 100644
--- a/include/vendor.php
+++ b/include/vendor.php
@@ -4,7 +4,7 @@
 /**********************************/
 
 /**
- * Vendor class for handling vendors.
+ * Vendor class for handling developers.
  */
 class Vendor {
     var $iVendorId;
@@ -94,7 +94,7 @@ class Vendor {
         }
         else
         {
-            addmsg("Error while creating a new vendor.", "red");
+            addmsg("Error while creating a new developer.", "red");
             return false;
         }
     }
@@ -208,7 +208,7 @@ class Vendor {
       // name
       $oTableRow = new TableRow();
 
-      $oTableCell = new TableCell("Vendor Name:");
+      $oTableCell = new TableCell("Developer name:");
       $oTableCell->SetAlign("right");
       $oTableCell->SetClass("color0");
       $oTableCell->SetBold(true);
@@ -223,7 +223,7 @@ class Vendor {
       // Url
       $oTableRow = new TableRow();
 
-      $oTableCell = new TableCell("Vendor URL:");
+      $oTableCell = new TableCell("Developer URL:");
       $oTableCell->SetAlign("right");
       $oTableCell->SetClass("color0");
       $oTableCell->SetBold(true);
@@ -372,17 +372,17 @@ class Vendor {
 
     function display()
     {
-        echo 'Vendor Name: '.$this->sName,"\n";
+        echo 'Developer name: '.$this->sName,"\n";
         if($this->canEdit())
         {
             echo "[<a href=\"".$_SERVER['PHP_SELF']."?sClass=vendor&amp;sAction=edit&amp;".
-                 "iId=$this->iVendorId&amp;sTitle=Edit%20Vendor\">edit</a>]";
+                 "iId=$this->iVendorId&amp;sTitle=Edit%20Developer\">edit</a>]";
         }
 
         echo '<br>',"\n";
         if ($this->sWebpage)
         {
-            echo 'Vendor URL:  <a href="'.$this->sWebpage.'">'.
+            echo 'Developer URL:  <a href="'.$this->sWebpage.'">'.
                  $this->sWebpage.'</a> <br>',"\n";
         }
 
@@ -409,7 +409,7 @@ class Vendor {
     /* Make a URL for viewing the specified vendor */
     function objectMakeUrl()
     {
-        $oManager = new objectManager("vendor", "View Vendor");
+        $oManager = new objectManager("vendor", "View Developer");
         return $oManager->makeUrl("view", $this->iVendorId);
     }
 
diff --git a/include/version.php b/include/version.php
index 5afa0b5..bb0dc36 100644
--- a/include/version.php
+++ b/include/version.php
@@ -1576,7 +1576,7 @@ class version {
         $oTableRow = new TableRow();
         $oTableRow->AddTextCell("Submission Date");
         $oTableRow->AddTextCell("Submitter");
-        $oTableRow->AddTextCell("Vendor");
+        $oTableRow->AddTextCell("Developer");
         $oTableRow->AddTextCell("Application");
         $oTableRow->AddTextCell("Version");
         $oTableRow->AddTextCell("Has Maintainer");