diff --git a/html/pages/device/dev-bgp.inc b/html/pages/device/bgp.inc
similarity index 100%
rename from html/pages/device/dev-bgp.inc
rename to html/pages/device/bgp.inc
diff --git a/html/pages/device/dev-data-linux.inc b/html/pages/device/dev-data-linux.inc
deleted file mode 100644
index 7ee3c14ab..000000000
--- a/html/pages/device/dev-data-linux.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-<?php
-
-if($device['uptime'] < '86400') { $uptime_colour = $warn_colour_a; }
-
-echo("
-<table width=100% cellspacing=0 cellpadding=0>
-  <tr><td class=tablehead>Operating System</td><td>$device[os] $device[version] ($device[features])</td></tr>
-  <tr><td class=tablehead>Hardware        </td><td>$device[hardware]</td></tr>
-  <tr><td class=tablehead>Uptime          </td><td bgcolor=$uptime_colour>" . formatuptime($device[uptime]) . "</td></tr>
-</table>
-");
-
-
-?>
diff --git a/html/pages/device/dev-edit.inc b/html/pages/device/edit.inc.php
similarity index 100%
rename from html/pages/device/dev-edit.inc
rename to html/pages/device/edit.inc.php