diff --git a/wp-content/themes/twentyten/functions.php b/wp-content/themes/twentyten/functions.php
index 9a23cceaa3..7fcf506206 100644
--- a/wp-content/themes/twentyten/functions.php
+++ b/wp-content/themes/twentyten/functions.php
@@ -39,7 +39,7 @@ function twentyten_init() {
 		require_once( $locale_file );
 }
 endif;
-add_action( 'themes_loaded', 'twentyten_init' );
+add_action( 'after_setup_theme', 'twentyten_init' );
 
 if ( ! function_exists( 'twentyten_admin_header_style' ) ) :
 function twentyten_admin_header_style() {
diff --git a/wp-settings.php b/wp-settings.php
index 71b999eb59..136acd10b2 100644
--- a/wp-settings.php
+++ b/wp-settings.php
@@ -265,7 +265,7 @@ if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/function
 if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
 	include( TEMPLATEPATH . '/functions.php' );
 
-do_action( 'themes_loaded' );
+do_action( 'after_setup_theme' );
 
 // Load any template functions the theme supports.
 require_if_theme_supports( 'post-thumbnails', ABSPATH . WPINC . '/post-thumbnail-template.php' );