6 files changed, 10 insertions, 10 deletions
diff --git a/Server/webadmin/files/guest.html b/Server/webadmin/files/guest.html
index 4f965b75c..27af93142 100644
--- a/Server/webadmin/files/guest.html
+++ b/Server/webadmin/files/guest.html
@@ -8,7 +8,7 @@
   
   <body>
     <p>
-      Hello! Welcome to the MCServer WebAdmin.
+      Hello! Welcome to the Cuberite WebAdmin.
     </p>
     <p>
       This is a default message, edit <b>files/guest.html</b> to add your own custom message.
diff --git a/Server/webadmin/files/login.css b/Server/webadmin/files/login.css
index 5d87da4c5..ad94e5810 100644
--- a/Server/webadmin/files/login.css
+++ b/Server/webadmin/files/login.css
@@ -1,4 +1,4 @@
-/* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */
+/* Copyright Justin S and Cuberite Team, licensed under CC-BY-SA 3.0 */
 * {
     margin: 0;
 }
diff --git a/Server/webadmin/files/style.css b/Server/webadmin/files/style.css
index 7c0671970..8cb803a05 100644
--- a/Server/webadmin/files/style.css
+++ b/Server/webadmin/files/style.css
@@ -1,4 +1,4 @@
-/* Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */
+/* Copyright Justin S and Cuberite Team, licensed under CC-BY-SA 3.0 */
 * {
     margin: 0;
 }
diff --git a/Server/webadmin/login_template.html b/Server/webadmin/login_template.html
index d0ab9b566..30b7d4f82 100644
--- a/Server/webadmin/login_template.html
+++ b/Server/webadmin/login_template.html
@@ -1,4 +1,4 @@
-<!-- Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 */ -->
+<!-- Copyright Justin S and Cuberite Team, licensed under CC-BY-SA 3.0 */ -->
 <html>
 <head>
 	<title>Cuberite WebAdmin - Login</title>
@@ -32,7 +32,7 @@
 				<tbody>
 					<tr>
 						<td class="thead rounded_top">
-							<div style="float:left!important"><strong>MCServer WebAdmin</strong></div>
+							<div style="float:left!important"><strong>Cuberite WebAdmin</strong></div>
 						</td>
 					</tr>
 					<tr>
diff --git a/Server/webadmin/template.html b/Server/webadmin/template.html
index b0864e35d..305c566cd 100644
--- a/Server/webadmin/template.html
+++ b/Server/webadmin/template.html
@@ -110,9 +110,9 @@
 			#cssmenu > ul > li > a:after { border-color:#707070; }
 			#cssmenu > ul > li > a:hover { background:#B8B8B8; }
 		</style>
-		<meta name="msapplication-tooltip" content="MCServer WebAdministrator"/>
+		<meta name="msapplication-tooltip" content="Cuberite WebAdmin"/>
 		<meta name="msapplication-navbutton-color" content="#B8B8B8" />
-		<link rel="shortcut icon" href="http://mc-server.org/favicon.ico" />
+		<link rel="shortcut icon" href="http://cuberite.org/favicon.ico" />
 	</head>
 	<body>
 		<div id="wrapper">
@@ -132,7 +132,7 @@
 				{CONTENT}
 			</div>
 			<footer>
-				<p>MCServer is using {MEM}MB of memory, with {NUMCHUNKS} chunks loaded.</p>
+				<p>Cuberite is using {MEM}MB of memory, with {NUMCHUNKS} chunks loaded.</p>
 				<p>Web Design by <a href="https://github.com/WebFreak001"@WebFreak001</a></p>
 			</footer>
 		</div>
diff --git a/Server/webadmin/template.lua b/Server/webadmin/template.lua
index 00b2523b7..03ef95088 100644
--- a/Server/webadmin/template.lua
+++ b/Server/webadmin/template.lua
@@ -81,7 +81,7 @@ function ShowPage(WebAdmin, TemplateRequest)
 	end
 
 	Output([[
-<!-- Copyright Justin S and MCServer Team, licensed under CC-BY-SA 3.0 -->
+<!-- Copyright Justin S and Cuberite Team, licensed under CC-BY-SA 3.0 -->
 <html>
 <head>
 	<title>]] .. Title .. [[</title>
@@ -94,7 +94,7 @@ function ShowPage(WebAdmin, TemplateRequest)
 	<div class="pagehead">
 		<div class="row1">
 			<div class="wrapper">
-				<img src="/logo_login.png" alt="MCServer Logo" class="logo">
+				<img src="/logo_login.png" alt="Cuberite Logo" class="logo">
 			</div>
 		</div>
 		<div id="panel">