diff --git a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php
index e5674b52405..9ce243f7b67 100644
--- a/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php
+++ b/app/code/core/Mage/Adminhtml/Block/Sales/Order/View/Giftmessage.php
@@ -50,7 +50,7 @@ public function getOrder()
      */
     protected function _beforeToHtml()
     {
-        if (Mage::helper('core')->isModuleOutputEnabled('Mage_Giftmessage')) {
+        if (Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
             if ($this->getParentBlock() && ($order = $this->getOrder())) {
                 $this->setEntity($order);
             }
@@ -61,13 +61,11 @@ protected function _beforeToHtml()
     }
 
     /**
-     * Prepares layout of block
-     *
      * @return $this
      */
     protected function _prepareLayout()
     {
-        if (Mage::helper('core')->isModuleOutputEnabled('Mage_Giftmessage')) {
+        if (Mage::helper('core')->isModuleOutputEnabled('Mage_GiftMessage')) {
             $this->setChild(
                 'save_button',
                 $this->getLayout()->createBlock('adminhtml/widget_button')
@@ -81,8 +79,6 @@ protected function _prepareLayout()
     }
 
     /**
-     * Retrieve save button html
-     *
      * @return string
      * @throws Exception
      */