diff --git a/src/assets/js/wishlist.js b/src/assets/js/wishlist.js
index 0a06ebfa..7f8bf4c0 100644
--- a/src/assets/js/wishlist.js
+++ b/src/assets/js/wishlist.js
@@ -33,25 +33,25 @@ $(function() {
     }
 
     /**
-     * Commit to Wish
+     * Fulfill wish
      */
-    $(document).on('click', '.ui.button.commit', function() {
+    $(document).on('click', '.ui.button.fulfill', function() {
         var button = $(this);
         var card   = button.closest('.ui.card');
         var column = card.closest('.column');
 
         $('body')
         .modal({
-            title   : text.modal_wish_commit_title,
-            content : text.modal_wish_commit,
+            title   : text.modal_wish_fulfill_title,
+            content : text.modal_wish_fulfill,
             class   : 'tiny',
             actions : [
                 {
-                    text : text.modal_wish_commit_approve,
+                    text : text.modal_wish_fulfill_approve,
                     class: 'approve primary'
                 },
                 {
-                    text : text.modal_wish_commit_deny,
+                    text : text.modal_wish_fulfill_deny,
                     class: ''
                 }
             ],
diff --git a/src/classes/page.php b/src/classes/page.php
index 66e49fec..49875365 100644
--- a/src/classes/page.php
+++ b/src/classes/page.php
@@ -245,10 +245,10 @@ class Page
                     modal_wishlist_delete_approve  : '<?= __('Yes, delete') ?>',
                     modal_wishlist_delete_deny     : '<?= __('No, keep') ?>',
 
-                    modal_wish_commit_title   : '<?= __('Really commit?') ?>',
-                    modal_wish_commit         : '<?= __('Would you really like to commit to this purchase? It will no longer appear in the wishlist for others anymore.') ?>',
-                    modal_wish_commit_approve : '<?= __('Yes, commit') ?>',
-                    modal_wish_commit_deny    : '<?= __('Cancel') ?>',
+                    modal_wish_fulfill_title   : '<?= __('Really fulfill wish?') ?>',
+                    modal_wish_fulfill         : '<?= __('Would you really like to fulfill this wish? It will no longer appear in the wishlist for others anymore.') ?>',
+                    modal_wish_fulfill_approve : '<?= __('Yes, fulfill wish') ?>',
+                    modal_wish_fulfill_deny    : '<?= __('Cancel') ?>',
                     modal_wish_delete_title   : '<?= __('Really delete?') ?>',
                     modal_wish_delete         : '<?= __('Would you really like to delete to this wish? It will be gone forever.') ?>',
                     modal_wish_delete_approve : '<?= __('Yes, delete') ?>',
diff --git a/src/classes/wish.php b/src/classes/wish.php
index 33edffc4..a2b93967 100644
--- a/src/classes/wish.php
+++ b/src/classes/wish.php
@@ -157,9 +157,9 @@ class Wish
 
             <div class="extra content buttons">
                 <?php if (!$userIsCurrent) { ?>
-                    <a class="ui small primary labeled icon button commit">
+                    <a class="ui small primary labeled icon button fulfill">
                         <i class="shopping cart icon"></i>
-                        Commit
+                        <?= __('Fulfill wish') ?>
                     </a>
                 <?php } ?>
 
@@ -168,24 +168,24 @@ class Wish
                        href="<?= $this->url ?>" target="_blank"
                     >
                         <i class="external icon"></i>
-                        Visit
+                        <?= __('Visit') ?>
                     </a>
                 <?php } ?>
 
                 <?php if ($userIsCurrent) { ?>
                     <div class="ui small labeled icon top left pointing dropdown button options">
                         <i class="cog icon"></i>
-                        <span class="text">Options</span>
+                        <span class="text"><?= __('Options') ?></span>
                         <div class="menu">
 
                             <a class="item" href="/?page=wish&id=<?= $this->id ?>">
                                 <i class="pen icon"></i>
-                                Edit
+                                <?= __('Edit') ?>
                             </a>
 
                             <div class="item wish-delete">
                                 <i class="trash icon"></i>
-                                Delete
+                                <?= __('Delete') ?>
                             </div>
 
                         </div>
diff --git a/src/pages/home.php b/src/pages/home.php
index 1341cf21..4535f8b6 100644
--- a/src/pages/home.php
+++ b/src/pages/home.php
@@ -43,7 +43,7 @@ $page->navigation();
 
         <div class="ui segment">
             <h2 class="ui header"><?= __('Use case') ?></h2>
-            <p><?= __('Your birthday is coming up and you just created a wishlist with all the cool stuff you want. Your friends and family want to make sure you get something you are happy with so you send them your wishlist link and if anybody decides to gift something to you, they simply commit to the wish and it will disappear for everybody else.') ?></p>
+            <p><?= __('Your birthday is coming up and you just created a wishlist with all the cool stuff you want. Your friends and family want to make sure you get something you are happy with so you send them your wishlist link and if anybody decides to fulfill one of your wishes, it will disappear for everybody else.') ?></p>
         </div>
 
         <div class="ui segment">
diff --git a/src/pages/wishlist.php b/src/pages/wishlist.php
index 245b9aa3..580d6e44 100644
--- a/src/pages/wishlist.php
+++ b/src/pages/wishlist.php
@@ -53,7 +53,7 @@ $page->navigation();
                 <h2 class="ui header"><?= __('What to do?') ?></h2>
                 <p><?= sprintf(
                     __('If you found something you would like to buy, click the %s button and it will become unavailable for others.'),
-                    '<span class="ui primary tiny horizontal label"><i class="shopping cart icon"></i> ' . __('Commit') . '</span>'
+                    '<span class="ui primary tiny horizontal label"><i class="shopping cart icon"></i> ' . __('Fulfill wish') . '</span>'
                 ) ?></p>
             </div>
         </div>