diff --git a/ext/custom_html_headers/info.php b/ext/custom_html_headers/info.php
index fec79af6..5ac483d3 100644
--- a/ext/custom_html_headers/info.php
+++ b/ext/custom_html_headers/info.php
@@ -9,7 +9,7 @@
  * Documentation:
  *
  */
-class custom_html_headersInfo extends ExtensionInfo
+class CustomHtmlHeadersInfo extends ExtensionInfo
 {
     public const KEY = "custom_html_headers";
 
diff --git a/ext/custom_html_headers/main.php b/ext/custom_html_headers/main.php
index 05bf22fb..5c6c6f18 100644
--- a/ext/custom_html_headers/main.php
+++ b/ext/custom_html_headers/main.php
@@ -1,6 +1,6 @@
 <?php
 
-class custom_html_headers extends Extension
+class CustomHtmlHeaders extends Extension
 {
     # Adds setup block for custom <head> content
     public function onSetupBuilding(SetupBuildingEvent $event)
diff --git a/ext/google_analytics/info.php b/ext/google_analytics/info.php
index 2c38ba63..a62cc880 100644
--- a/ext/google_analytics/info.php
+++ b/ext/google_analytics/info.php
@@ -9,7 +9,7 @@
  * Documentation:
  *
  */
-class google_analyticsInfo extends ExtensionInfo
+class GoogleAnalyticsInfo extends ExtensionInfo
 {
     public const KEY = "google_analytics";
 
diff --git a/ext/google_analytics/main.php b/ext/google_analytics/main.php
index f8ff53e8..fb702dfb 100644
--- a/ext/google_analytics/main.php
+++ b/ext/google_analytics/main.php
@@ -1,6 +1,6 @@
 <?php
 
-class google_analytics extends Extension
+class GoogleAnalytics extends Extension
 {
     # Add analytics to config
     public function onSetupBuilding(SetupBuildingEvent $event)
diff --git a/ext/rss_comments/info.php b/ext/rss_comments/info.php
index 41ec0d0c..f6074f62 100644
--- a/ext/rss_comments/info.php
+++ b/ext/rss_comments/info.php
@@ -8,7 +8,7 @@
  * Description: Self explanatory
  */
 
-class RSS_CommentsInfo extends ExtensionInfo
+class RSSCommentsInfo extends ExtensionInfo
 {
     public const KEY = "rss_comments";
 
diff --git a/ext/rss_comments/main.php b/ext/rss_comments/main.php
index 0fe99de8..6358ddc7 100644
--- a/ext/rss_comments/main.php
+++ b/ext/rss_comments/main.php
@@ -1,6 +1,6 @@
 <?php
 
-class RSS_Comments extends Extension
+class RSSComments extends Extension
 {
     public function onPostListBuilding(PostListBuildingEvent $event)
     {
diff --git a/ext/rss_images/info.php b/ext/rss_images/info.php
index 41c7ad3a..33f814ed 100644
--- a/ext/rss_images/info.php
+++ b/ext/rss_images/info.php
@@ -7,7 +7,7 @@
  * License: GPLv2
  * Description: Self explanatory
  */
-class RSS_ImagesInfo extends ExtensionInfo
+class RSSImagesInfo extends ExtensionInfo
 {
     public const KEY = "rss_images";
 
diff --git a/ext/rss_images/main.php b/ext/rss_images/main.php
index a7a49036..f6cf9632 100644
--- a/ext/rss_images/main.php
+++ b/ext/rss_images/main.php
@@ -1,7 +1,7 @@
 <?php
 
 
-class RSS_Images extends Extension
+class RSSImages extends Extension
 {
     public function onPostListBuilding(PostListBuildingEvent $event)
     {
diff --git a/ext/rss_images/theme.php b/ext/rss_images/theme.php
index 15094a81..f213fa60 100644
--- a/ext/rss_images/theme.php
+++ b/ext/rss_images/theme.php
@@ -1,5 +1,5 @@
 <?php
 /* needed for access to build_thumb_html */
-class RSS_ImagesTheme extends Themelet
+class RSSImagesTheme extends Themelet
 {
 }
diff --git a/ext/source_history/info.php b/ext/source_history/info.php
index 300cc1c0..cce9a369 100644
--- a/ext/source_history/info.php
+++ b/ext/source_history/info.php
@@ -6,7 +6,7 @@
  * Description: Keep a record of source changes, and allows you to revert changes.
  */
 
-class Source_HistoryInfo extends ExtensionInfo
+class SourceHistoryInfo extends ExtensionInfo
 {
     public const KEY = "source_history";
 
diff --git a/ext/source_history/main.php b/ext/source_history/main.php
index 25db63e9..fc4b5f71 100644
--- a/ext/source_history/main.php
+++ b/ext/source_history/main.php
@@ -1,6 +1,6 @@
 <?php
 
-class Source_History extends Extension
+class SourceHistory extends Extension
 {
     // in before source are actually set, so that "get current source" works
     public function get_priority(): int
diff --git a/ext/source_history/theme.php b/ext/source_history/theme.php
index fbe5a332..667dec53 100644
--- a/ext/source_history/theme.php
+++ b/ext/source_history/theme.php
@@ -1,5 +1,5 @@
 <?php
-class Source_HistoryTheme extends Themelet
+class SourceHistoryTheme extends Themelet
 {
     private $messages = [];
 
diff --git a/ext/tag_history/info.php b/ext/tag_history/info.php
index 6a478462..1bdc54ed 100644
--- a/ext/tag_history/info.php
+++ b/ext/tag_history/info.php
@@ -6,7 +6,7 @@
  * Description: Keep a record of tag changes, and allows you to revert changes.
  */
 
-class Tag_HistoryInfo extends ExtensionInfo
+class TagHistoryInfo extends ExtensionInfo
 {
     public const KEY = "tag_history";
 
diff --git a/ext/tag_history/main.php b/ext/tag_history/main.php
index e519dd3e..ea243f2a 100644
--- a/ext/tag_history/main.php
+++ b/ext/tag_history/main.php
@@ -1,6 +1,6 @@
 <?php
 
-class Tag_History extends Extension
+class TagHistory extends Extension
 {
     // in before tags are actually set, so that "get current tags" works
     public function get_priority(): int
diff --git a/ext/tag_history/theme.php b/ext/tag_history/theme.php
index 9e51ccb8..099b8215 100644
--- a/ext/tag_history/theme.php
+++ b/ext/tag_history/theme.php
@@ -4,7 +4,7 @@
  * Author: Bzchan <bzchan@animemahou.com>, modified by jgen <jgen.tech@gmail.com>
  */
 
-class Tag_HistoryTheme extends Themelet
+class TagHistoryTheme extends Themelet
 {
     private $messages = [];
 
diff --git a/ext/tagger/theme.php b/ext/tagger/theme.php
index 6d56811d..fbdb0a1e 100644
--- a/ext/tagger/theme.php
+++ b/ext/tagger/theme.php
@@ -5,7 +5,7 @@
  * Do not remove this notice.                                                *
  * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
-class taggerTheme extends Themelet
+class TaggerTheme extends Themelet
 {
     public function build_tagger(Page $page, $event)
     {
