diff --git a/core/includes/common.inc b/core/includes/common.inc
index 70395ba..aaa722b 100644
--- a/core/includes/common.inc
+++ b/core/includes/common.inc
@@ -3477,7 +3477,7 @@ function drupal_pre_render_styles($elements) {
 function drupal_build_css_cache($css) {
   $data = '';
   $uri = '';
-  $map = variable_get('drupal_css_cache_files', array());
+  $map = variable_get('preprocess_css_cache_files', array());
   $key = hash('sha256', serialize($css));
   if (isset($map[$key])) {
     $uri = $map[$key];
@@ -3535,7 +3535,7 @@ function drupal_build_css_cache($css) {
     }
     // Save the updated map.
     $map[$key] = $uri;
-    variable_set('drupal_css_cache_files', $map);
+    variable_set('preprocess_css_cache_files', $map);
   }
   return $uri;
 }
@@ -3700,7 +3700,7 @@ function _drupal_load_stylesheet($matches) {
  * Deletes old cached CSS files.
  */
 function drupal_clear_css_cache() {
-  variable_del('drupal_css_cache_files');
+  variable_del('preprocess_css_cache_files');
   file_scan_directory('public://css', '/.*/', array('callback' => 'drupal_delete_file_if_stale'));
 }
 
@@ -3712,8 +3712,8 @@ function drupal_clear_css_cache() {
  * - drupal_clear_js_cache()
  */
 function drupal_delete_file_if_stale($uri) {
-  // Default stale file threshold is 30 days.
-  if (REQUEST_TIME - filemtime($uri) > variable_get('drupal_stale_file_threshold', 2592000)) {
+  // Default stale file threshold is 3 days.
+  if (REQUEST_TIME - filemtime($uri) > variable_get('drupal_stale_file_threshold', 259200)) {
     file_unmanaged_delete($uri);
   }
 }
@@ -4271,7 +4271,7 @@ function drupal_pre_render_scripts($elements) {
 
   // Since JavaScript may look for arguments in the URL and act on them, some
   // third-party code might require the use of a different query string.
-  $js_version_string = variable_get('drupal_js_version_query_string', 'v=');
+  $js_version_string = variable_get('js_version_query_string', 'v=');
 
   // Defaults for each SCRIPT element.
   $element_defaults = array(
@@ -4979,7 +4979,7 @@ function drupal_add_tabledrag($table_id, $action, $relationship, $group, $subgro
 function drupal_build_js_cache($files) {
   $contents = '';
   $uri = '';
-  $map = variable_get('drupal_js_cache_files', array());
+  $map = variable_get('preprocess_js_cache_files', array());
   $key = hash('sha256', serialize($files));
   if (isset($map[$key])) {
     $uri = $map[$key];
@@ -5014,7 +5014,7 @@ function drupal_build_js_cache($files) {
       }
     }
     $map[$key] = $uri;
-    variable_set('drupal_js_cache_files', $map);
+    variable_set('preprocess_js_cache_files', $map);
   }
   return $uri;
 }
@@ -5024,7 +5024,7 @@ function drupal_build_js_cache($files) {
  */
 function drupal_clear_js_cache() {
   variable_del('javascript_parsed');
-  variable_del('drupal_js_cache_files');
+  variable_del('preprocess_js_cache_files');
   file_scan_directory('public://js', '/.*/', array('callback' => 'drupal_delete_file_if_stale'));
 }