Make name of package uniform

4 files changed, 16 insertions, 16 deletions

diff --git a/config/openospfd/openospfd.inc b/config/openospfd/openospfd.inc
index 5b600506..c94b9751 100644
--- a/config/openospfd/openospfd.inc
+++ b/config/openospfd/openospfd.inc
@@ -41,7 +41,7 @@ function ospfd_install_conf() {
 		if($config['installedpackages']['ospfd']['config']) 
 			$ospfd_conf = &$config['installedpackages']['ospfd']['config'][0];
 		else {
-			log_error("OSPFd: No config data found.");
+			log_error("OpenOSPFd: No config data found.");
 			return;
 		}
     
@@ -194,7 +194,7 @@ function ospfd_validate_input() {
 	if ($_POST['spfdelay'] <> "" && ($_POST['spfdelay'] < 1 || $_POST['spfdelay'] > 10))
 		$input_errors[] = "SPF delay needs to be between 1 and 10.";
 	if (!$config['installedpackages']['ospfdinterfaces']['config'])
-		$input_errors[] = "Please select an interface to use for OSPFd.";
+		$input_errors[] = "Please select an interface to use for OpenOSPFd.";
 }
 
 // get the raw ospfd confi file for manual inspection/editing
diff --git a/config/openospfd/openospfd.xml b/config/openospfd/openospfd.xml
index d80ff258..66079152 100644
--- a/config/openospfd/openospfd.xml
+++ b/config/openospfd/openospfd.xml
@@ -1,7 +1,7 @@
 <packagegui>
-	<name>OSPFd</name>
+	<name>OpenOSPFd</name>
 	<version>0.1</version>
-	<title>Services: OSPFd</title>
+	<title>Services: OpenOSPFd</title>
 	<include_file>/usr/local/pkg/openospfd.inc</include_file>
 	<aftersaveredirect>pkg_edit.php?xml=openospfd.xml&amp;id=0</aftersaveredirect>
 	<additional_files_needed>
@@ -20,7 +20,7 @@
 		<item>http://www.pfsense.com/packages/config/openospfd/status_ospfd.php</item>
 	</additional_files_needed>
 	<menu>
-		<name>OSPFd</name>
+		<name>OpenOSPFd</name>
 		<tooltiptext>Modify ospfd settings.</tooltiptext>
 		<section>Services</section>
 		<configfile>openospfd.xml</configfile>
@@ -56,7 +56,7 @@
 		<field>
 			<fielddescr>Area</fielddescr>
 			<fieldname>area</fieldname>
-			<description>OSPF area for this instance of OSPFd.</description>
+			<description>OpenOSPFd area for this instance of OSPF.</description>
 			<type>input</type>
 			<required/>
 		</field>
diff --git a/config/openospfd/openospfd_interfaces.xml b/config/openospfd/openospfd_interfaces.xml
index 0608fade..7802abea 100644
--- a/config/openospfd/openospfd_interfaces.xml
+++ b/config/openospfd/openospfd_interfaces.xml
@@ -1,7 +1,7 @@
 <packagegui>
-	<name>OSPFd Interfaces</name>
+	<name>OpenOSPFd Interfaces</name>
 	<version>0.1</version>
-	<title>Services: OSPFd</title>
+	<title>Services: OpenOSPFd</title>
 	<include_file>/usr/local/pkg/openospfd.inc</include_file>
 	<aftersaveredirect>pkg_edit.php?xml=openospfd.xml&amp;id=0</aftersaveredirect>
 	<additional_files_needed>
@@ -10,7 +10,7 @@
 		<item>http://www.pfsense.com/packages/config/openospfd/openospfd.inc</item>
 	</additional_files_needed>
 	<menu>
-		<name>OSPFd</name>
+		<name>OSPF</name>
 		<tooltiptext>Modify ospfd settings.</tooltiptext>
 		<section>Services</section>
 		<configfile>openospfd.xml</configfile>
@@ -73,7 +73,7 @@
 			<type>checkbox</type>
 		</field>
 		<field>
-			<fielddescr>Enable MD5 password for this OSPFd interface (default no)</fielddescr>
+			<fielddescr>Enable MD5 password for this OpenOSPFd interface (default no)</fielddescr>
 			<fieldname>md5password</fieldname>
 			<description>Enables the use of an MD5 password to on this instance</description>
 			<type>checkbox</type>
diff --git a/config/openospfd/status_ospfd.php b/config/openospfd/status_ospfd.php
index c60335de..c02e5d10 100644
--- a/config/openospfd/status_ospfd.php
+++ b/config/openospfd/status_ospfd.php
@@ -29,7 +29,7 @@
 
 require("guiconfig.inc");
 
-$pgtitle = "OpenOSPFD: Status";
+$pgtitle = "OpenOSPFd: Status";
 include("head.inc");
 
 /* List all of the commands as an index. */
@@ -122,11 +122,11 @@ if(strstr($pfSversion, "1.2"))
 					<tr>
 						<td>
 					<?php
-						defCmdT("OpenOSPFD Summary","/usr/local/sbin/ospfctl show summary"); 
-						defCmdT("OpenOSPFD Neighbors","/usr/local/sbin/ospfctl show neighbor"); 
-						defCmdT("OpenOSPFD FIB","/usr/local/sbin/ospfctl show fib");
-						defCmdT("OpenOSPFD RIB","/usr/local/sbin/ospfctl show rib"); 
-						defCmdT("OpenOSPFD Interfaces","/usr/local/sbin/ospfctl show interfaces"); 
+						defCmdT("OpenOSPFd Summary","/usr/local/sbin/ospfctl show summary"); 
+						defCmdT("OpenOSPFd Neighbors","/usr/local/sbin/ospfctl show neighbor"); 
+						defCmdT("OpenOSPFd FIB","/usr/local/sbin/ospfctl show fib");
+						defCmdT("OpenOSPFd RIB","/usr/local/sbin/ospfctl show rib"); 
+						defCmdT("OpenOSPFd Interfaces","/usr/local/sbin/ospfctl show interfaces"); 
 						defCmdT("OpenOSPFD Database","/usr/local/sbin/ospfctl show database"); 
 					?>
 					<div id="cmdspace" style="width:100%">