diff --git a/apps.drush.inc b/apps.drush.inc
index 3718708..1c5fc40 100755
--- a/apps.drush.inc
+++ b/apps.drush.inc
@@ -85,10 +85,10 @@ function drush_apps_list() {
     foreach ($apps as $k => $app) {
       $status = '';
       switch($app['status']) {
-        CASE INCOMPATABLE : $status = 'Incompatable'; break;
-        CASE DISABLED : $status = 'Disabled'; break;
-        CASE ENABLED : $status = 'Enabled'; break;
-        CASE INSTALLABLE : $status = 'Installable'; break;
+        CASE APPS_INCOMPATIBLE : $status = 'Incompatible'; break;
+        CASE APPS_DISABLED : $status = 'Disabled'; break;
+        CASE APPS_ENABLED : $status = 'Enabled'; break;
+        CASE APPS_INSTALLABLE : $status = 'Installable'; break;
       }
       $rows[] = array(
         $k,
diff --git a/apps.manifest.inc b/apps.manifest.inc
index 6c41c09..57651b1 100755
--- a/apps.manifest.inc
+++ b/apps.manifest.inc
@@ -5,10 +5,10 @@
  *
  */
 
-define ("ENABLED", 1);
-define ("DISABLED", 0);
-define ("INCOMPATABLE", -1);
-define ("INSTALLABLE", 2);
+define("APPS_ENABLED", 1);
+define("APPS_DISABLED", 0);
+define("APPS_INCOMPATIBLE", -1);
+define("APPS_INSTALLABLE", 2);
 
 
 function apps_server_local($server) {
@@ -331,13 +331,13 @@ function apps_manifest($server) {
         $incompatable = $current ? (bool) drupal_check_incompatibility($version, $current->info['version']) : FALSE;
         $installed = (bool) $current;
         $enabled = $current && $current->status;
-        $status = $incompatable ? INCOMPATABLE : (!$installed ? INSTALLABLE : ($enabled ? ENABLED : DISABLED));
+        $status = $incompatable ? APPS_INCOMPATIBLE : (!$installed ? APPS_INSTALLABLE : ($enabled ? APPS_ENABLED : APPS_DISABLED));
 
-        if($status == INCOMPATABLE) {
+        if($status == APPS_INCOMPATIBLE) {
           //if any one module is incompatable then the app is incompatable
           $app['incompatable'] = TRUE;
         }
-        if($status == INSTALLABLE) {
+        if($status == APPS_INSTALLABLE) {
           //if any one module is installable then we are not installed yet
           $app['dep_installed'] = FALSE;
         }
@@ -358,7 +358,7 @@ function apps_manifest($server) {
           $info = array(
             'downloadable' => $downloadable,
             'version' => array('name'=>$name_version),
-            'status' => INSTALLABLE,
+            'status' => APPS_INSTALLABLE,
             'incompatable' => 0,
             'enabled' => 0,
             'installed' =>  is_dir(DRUPAL_ROOT . "/sites/all/libraries/$name_version"),
@@ -366,7 +366,7 @@ function apps_manifest($server) {
           $app['libraries'][$name_version] = $info;
         }
       }
-      $app['status'] = $app['incompatable'] ? INCOMPATABLE : (!$app['installed'] || !$app['dep_installed'] ? INSTALLABLE : ($app['enabled'] ? ENABLED : DISABLED));
+      $app['status'] = $app['incompatable'] ? APPS_INCOMPATIBLE : (!$app['installed'] || !$app['dep_installed'] ? APPS_INSTALLABLE : ($app['enabled'] ? APPS_ENABLED : APPS_DISABLED));
       $apps[$app['machine_name']] = $app;
       
     }
diff --git a/apps.pages.inc b/apps.pages.inc
index f17cbd1..c84b1c4 100755
--- a/apps.pages.inc
+++ b/apps.pages.inc
@@ -140,11 +140,11 @@ function _apps_app_access($perm, $server_name, $action, $app_name) {
       case FALSE:
         return TRUE;
       case 'enable':
-        return ($app['status'] === DISABLED);
+        return ($app['status'] === APPS_DISABLED);
       case 'disable':
-        return ($app['status'] === ENABLED);
+        return ($app['status'] === APPS_ENABLED);
       case 'install':
-        return ($app['status'] === INSTALLABLE);
+        return ($app['status'] === APPS_INSTALLABLE);
       case 'configure-action':
       case 'configure': 
         return (bool) apps_app_callback($app, "configure form") || apps_app_callback($app, "demo content enabled callback");
diff --git a/theme/apps.theme.inc b/theme/apps.theme.inc
index 31f0ea6..675ef75 100755
--- a/theme/apps.theme.inc
+++ b/theme/apps.theme.inc
@@ -30,12 +30,12 @@ function template_preprocess_apps_app_teaser(&$vars) {
     $vars['logo'] = FALSE;
   }
   $status = $vars['app']['status'];
-  $vars['status'] = $status === ENABLED ?
+  $vars['status'] = $status === APPS_ENABLED ?
     'enabled' :
-    (($status === DISABLED) ?
+    (($status === APPS_DISABLED) ?
       'disabled' :
-      (($status === INCOMPATABLE) ?
-        'incompatable' :
+      (($status === APPS_INCOMPATIBLE) ?
+        'incompatible' :
         'available'
       )
     );
@@ -74,20 +74,20 @@ function template_preprocess_apps_app_page(&$vars) {
   $vars['name'] = $vars['app']['name'];
   $vars['author'] = l($vars['app']['author'], $vars['app']['author_url']);
   $vars['version'] = t('Version') . ' ' . $vars['app']['version'];
-  if ($vars['app']['status'] === INCOMPATABLE) {
+  if ($vars['app']['status'] === APPS_INCOMPATIBLE) {
     $incompatable_deps = array();
     $incompatable_message = '';
     foreach($vars['app']['dependencies'] as $dep) {
-      if ($dep['status'] === INCOMPATABLE) {
+      if ($dep['status'] === APPS_INCOMPATIBLE) {
         $incompatable_deps[] = "{$dep['version']['name']} {$dep['version']['original_version']}";
       }
     }
     if (!empty($incompatable_deps)) {
-      $incompatable_message = "Incompatable - requires " . implode(", ", $incompatable_deps);
+      $incompatable_message = "Incompatible - requires " . implode(", ", $incompatable_deps);
     }
     else {
       //this should never run
-      $incompatable_message = "Incompatable with current install";
+      $incompatable_message = "Incompatible with current install";
     }
     //drupal_set_message($incompatable_message, 'error');
     $vars['status'] = $incompatable_message;