diff --git a/entity_boxes.admin.inc b/entity_boxes.admin.inc
index 755ed16..14bd904 100644
--- a/entity_boxes.admin.inc
+++ b/entity_boxes.admin.inc
@@ -186,7 +186,7 @@ function entity_boxes_edit_form($form, &$form_state, $entity_boxes = FALSE) {
 
   $form['actions']['submit'] = array(
     '#type' => 'submit',
-    '#value' => t('Save entity_boxes'),
+    '#value' => t('Save @entity_boxes', array('@entity_boxes' => !empty($entity_boxes->name) ? $entity_boxes->type : '')),
     '#submit' => $submit + array('entity_boxes_edit_form_submit'),
   );
   
@@ -194,7 +194,7 @@ function entity_boxes_edit_form($form, &$form_state, $entity_boxes = FALSE) {
     $cancel_path = (path_is_admin($_GET['q'])) ? 'admin/content/entity_boxes' : $_GET['q'];
     $form['actions']['delete'] = array(
       '#type' => 'submit',
-      '#value' => t('Delete entity_boxes'),
+      '#value' => t('Delete @entity_boxes', array('@entity_boxes' => $entity_boxes->type)),
       '#suffix' => l(t('Cancel'), $cancel_path),
       '#submit' => $submit + array('entity_boxes_form_submit_delete'),
       '#weight' => 45,