diff --git a/classes/downloads/eclipseInstaller.php b/classes/downloads/eclipseInstaller.php
index 5a09b90..7c89b81 100644
--- a/classes/downloads/eclipseInstaller.php
+++ b/classes/downloads/eclipseInstaller.php
@@ -280,7 +280,7 @@
   public function getInstallerLinks($version = NULL, $os = NULL) {
 
     $os_client = $this->_getClientOS();
-    $accepted_os = array('windows','macosx','linux');
+    $accepted_os = array('windows','macos','linux');
     if (!empty($os) && in_array($os, $accepted_os)) {
       $os_client = $os;
     }
@@ -329,12 +329,12 @@
       return $download_links;
     }
 
-   $accepted_version = array('64bit','32bit');
+   $accepted_version = array('x86_64','32bit');
     if (!empty($version) && !in_array($version, $accepted_version)) {
       return array();
     }
 
-    $accepted_os = array('windows','macosx','linux');
+    $accepted_os = array('windows','macos','linux');
     if (!empty($os) && !in_array($os, $accepted_os)) {
       return array();
     }
@@ -427,7 +427,7 @@
       $os = "linux";
     }
     if ($client_os == "macosx" || $client_os == "cocoa64" || $client_os == "carbon") {
-      $os = "macosx";
+      $os = "macos";
     }
 
     // Check if the OS has been selected manually
diff --git a/classes/downloads/views/view.category.php b/classes/downloads/views/view.category.php
index 3b7fbeb..6dc2002 100644
--- a/classes/downloads/views/view.category.php
+++ b/classes/downloads/views/view.category.php
@@ -24,7 +24,7 @@
         <!-- Installer -->
         <div class="col-md-10th col-sm-24">
           <div class="downloads-installer">
-            <?php print $this->Installer->output('64bit'); ?>
+            <?php print $this->Installer->output('x86_64'); ?>
           </div>
         </div>
       <?php endif;?>