diff --git a/admin/code/SecurityAdmin.php b/admin/code/SecurityAdmin.php
index 2f45f2d9e..704718028 100755
--- a/admin/code/SecurityAdmin.php
+++ b/admin/code/SecurityAdmin.php
@@ -68,7 +68,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		if($record && !$record->canView()) return Security::permissionFailure($this);
 		
 		$memberList = GridField::create(
-			'Member',
+			'Members',
 			false,
 			DataList::create('Member'),
 			$memberListConfig = GridFieldConfig_RecordEditor::create()
@@ -77,7 +77,7 @@ class SecurityAdmin extends LeftAndMain implements PermissionProvider {
 		$memberListConfig->getComponentByType('GridFieldDetailForm')->setValidator(new Member_Validator());
 
 		$groupList = GridField::create(
-			'Group',
+			'Groups',
 			false,
 			DataList::create('Group'),
 			GridFieldConfig_RecordEditor::create()
diff --git a/forms/gridfield/GridFieldAddNewButton.php b/forms/gridfield/GridFieldAddNewButton.php
index 649bd3433..61e135549 100644
--- a/forms/gridfield/GridFieldAddNewButton.php
+++ b/forms/gridfield/GridFieldAddNewButton.php
@@ -15,7 +15,7 @@ class GridFieldAddNewButton implements GridField_HTMLProvider {
 	public function getHTMLFragments($gridField) {
 		$data = new ArrayData(array(
 			'NewLink' => Controller::join_links($gridField->Link('item'), 'new'),
-			'ButtonName' => _t('GridField.Add', 'Add {name}', array('name' => $gridField->name)),
+			'ButtonName' => _t('GridField.Add', 'Add {name}', array('name' => $gridField->getModelClass())),
 		));
 		return array(
 			$this->targetFragment => $data->renderWith('GridFieldAddNewbutton'),