diff --git a/modules/data/webadmin/tmpl/add_edit_chan.tmpl b/modules/data/webadmin/tmpl/add_edit_chan.tmpl
index b20e74ed..af217e7d 100644
--- a/modules/data/webadmin/tmpl/add_edit_chan.tmpl
+++ b/modules/data/webadmin/tmpl/add_edit_chan.tmpl
@@ -26,8 +26,8 @@
 				</div>
 
 				<div class="subsection">
-					<div class="inputlabel">Buffer Count:</div>
-					<input type="number" name="buffercount" value="<? VAR BufferCount ?>" size="10" min="0"
+					<div class="inputlabel">Buffer Size:</div>
+					<input type="number" name="buffersize" value="<? VAR BufferSize ?>" size="10" min="0"
 						   title="The buffer count." />
 				</div>
 
diff --git a/modules/data/webadmin/tmpl/add_edit_network.tmpl b/modules/data/webadmin/tmpl/add_edit_network.tmpl
index 7eeb504d..f03cb606 100644
--- a/modules/data/webadmin/tmpl/add_edit_network.tmpl
+++ b/modules/data/webadmin/tmpl/add_edit_network.tmpl
@@ -169,7 +169,7 @@
 						<td>Name</td>
 						<td>CurModes</td>
 						<td>DefModes</td>
-						<td>BufferCount</td>
+						<td>BufferSize</td>
 						<td>Options</td>
 				<? ELSE ?>
 						<td>&lt;- Add a channel (opens in same page)</td>
@@ -188,7 +188,7 @@
 						<td><? VAR Name ?></td>
 						<td><? VAR CurModes ?></td>
 						<td><? VAR DefModes ?></td>
-						<td><? VAR BufferCount ?></td>
+						<td><? VAR BufferSize ?></td>
 						<td><? VAR Options ?></td>
 					</tr>
 			<? ENDLOOP ?>
diff --git a/modules/webadmin.cpp b/modules/webadmin.cpp
index 8d4bd467..81f12779 100644
--- a/modules/webadmin.cpp
+++ b/modules/webadmin.cpp
@@ -645,7 +645,7 @@ public:
 				Tmpl["Edit"] = "true";
 				Tmpl["Title"] = "Edit Channel" + CString(" [" + pChan->GetName() + "]") + " of Network [" + pNetwork->GetName() + "] of User [" + pNetwork->GetUser()->GetUserName() + "]";
 				Tmpl["ChanName"] = pChan->GetName();
-				Tmpl["BufferCount"] = CString(pChan->GetBufferCount());
+				Tmpl["BufferSize"] = CString(pChan->GetBufferCount());
 				Tmpl["DefModes"] = pChan->GetDefaultModes();
 				Tmpl["Key"] = pChan->GetKey();
 				breadChan["Text"] = "Edit Channel [" + pChan->GetName() + "]";
@@ -656,7 +656,7 @@ public:
 			} else {
 				Tmpl["Action"] = "addchan";
 				Tmpl["Title"] = "Add Channel" + CString(" for User [" + pUser->GetUserName() + "]");
-				Tmpl["BufferCount"] = CString(pUser->GetBufferCount());
+				Tmpl["BufferSize"] = CString(pUser->GetBufferCount());
 				Tmpl["DefModes"] = CString(pUser->GetDefaultChanModes());
 				Tmpl["InConfig"] = "true";
 				breadChan["Text"] = "Add Channel";
@@ -716,9 +716,9 @@ public:
 			}
 		}
 
-		unsigned int uBufferCount = WebSock.GetParam("buffercount").ToUInt();
-		if (pChan->GetBufferCount() != uBufferCount) {
-			pChan->SetBufferCount(uBufferCount, spSession->IsAdmin());
+		unsigned int uBufferSize = WebSock.GetParam("buffersize").ToUInt();
+		if (pChan->GetBufferCount() != uBufferSize) {
+			pChan->SetBufferCount(uBufferSize, spSession->IsAdmin());
 		}
 		pChan->SetDefaultModes(WebSock.GetParam("defmodes"));
 		pChan->SetInConfig(WebSock.GetParam("save").ToBool());
@@ -879,9 +879,9 @@ public:
 					l["CurModes"] = pChan->GetModeString();
 					l["DefModes"] = pChan->GetDefaultModes();
 					if (pChan->HasBufferCountSet()) {
-						l["BufferCount"] = CString(pChan->GetBufferCount());
+						l["BufferSize"] = CString(pChan->GetBufferCount());
 					} else {
-						l["BufferCount"] = CString(pChan->GetBufferCount()) + " (default)";
+						l["BufferSize"] = CString(pChan->GetBufferCount()) + " (default)";
 					}
 					l["Options"] = pChan->GetOptions();