diff --git a/wp-includes/default-filters.php b/wp-includes/default-filters.php
index 90cf4d025..f1c4d1177 100644
--- a/wp-includes/default-filters.php
+++ b/wp-includes/default-filters.php
@@ -86,6 +86,10 @@ foreach ( array( 'comment_author', 'term_name', 'link_name', 'link_description',
 	add_filter( $filter, 'esc_html'      );
 }
 
+// Format WordPress
+foreach ( array( 'the_content', 'the_title', 'comment_text' ) as $filter )
+	add_filter( $filter, 'capital_P_dangit' );
+
 // Format titles
 foreach ( array( 'single_post_title', 'single_cat_title', 'single_tag_title', 'single_month_title', 'nav_menu_attr_title', 'nav_menu_description' ) as $filter ) {
 	add_filter( $filter, 'wptexturize' );
@@ -247,3 +251,5 @@ add_filter( 'pre_option_gmt_offset','wp_timezone_override_offset' );
 // Admin Color Schemes
 add_action( 'admin_init', 'register_admin_color_schemes', 1);
 add_action( 'admin_color_scheme_picker', 'admin_color_scheme_picker' );
+
+?>
\ No newline at end of file
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index eebaace2d..fe3a3e967 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -2817,4 +2817,15 @@ function sanitize_text_field($str) {
 	return apply_filters('sanitize_text_field', $filtered, $str);
 }
 
+/**
+ * Forever eliminate "Wordpress" from the planet (or at least the little bit we can influence).
+ *
+ * Violating our coding standards for a good function name.
+ *
+ * @since 3.0.0
+ */
+function capital_P_dangit( $text ) {
+       return str_replace( 'Wordpress', 'WordPress', $text );
+}
+
 ?>