diff --git a/extensions/base/curseprofile.py b/extensions/base/curseprofile.py
new file mode 100644
index 0000000..24c7138
--- /dev/null
+++ b/extensions/base/curseprofile.py
@@ -0,0 +1,234 @@
+#  This file is part of Recent changes Goat compatible Discord webhook (RcGcDw).
+#
+#  RcGcDw is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  RcGcDw is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with RcGcDw.  If not, see <http://www.gnu.org/licenses/>.
+
+
+import logging
+from src.configloader import settings
+from src.discord.message import DiscordMessage
+from src.api import formatter
+from src.i18n import rc_formatters
+from src.api.context import Context
+from src.api.util import embed_helper, clean_link, compact_author, create_article_path, sanitize_to_markdown, sanitize_to_url
+from src.misc import profile_field_name
+
+_ = rc_formatters.gettext
+ngettext = rc_formatters.ngettext
+
+
+# CurseProfile - https://help.fandom.com/wiki/Extension:CurseProfile
+# curseprofile/profile-edited - Editing user profile
+
+
+@formatter.embed(event="curseprofile/profile-edited")
+def embed_curseprofile_profile_edited(ctx: Context, change: dict) -> DiscordMessage:
+    embed = DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url)
+    embed_helper(ctx, embed, change)
+    target_user = change["title"].split(':', 1)[1]
+    if target_user != change["user"]:
+        embed["title"] = _("Edited {target}'s profile").format(target=sanitize_to_markdown(target_user))
+    else:
+        embed["title"] = _("Edited their own profile")
+    if ctx.parsedcomment is None:  # If the field is empty
+        embed["description"] = _("Cleared the {field} field").format(field=profile_field_name(change["logparams"]['4:section'], True))
+    else:
+        embed["description"] = _("{field} field changed to: {desc}").format(field=profile_field_name(change["logparams"]['4:section'], True), desc=ctx.parsedcomment)
+    embed["url"] = create_article_path("UserProfile:" + sanitize_to_url(target_user))
+    return embed
+
+
+@formatter.compact(event="curseprofile/profile-edited")
+def compact_curseprofile_profile_edited(ctx: Context, change: dict) -> DiscordMessage:
+    author, author_url = compact_author(ctx, change)
+    target_user = change["title"].split(':', 1)[1]
+    link = clean_link(create_article_path("UserProfile:" + sanitize_to_url(target_user)))
+    if target_user != author:
+        if ctx.parsedcomment is None:  # If the field is empty
+            edit_clear_message = _("[{author}]({author_url}) cleared the {field} on [{target}]({target_url})'s profile.")
+        else:
+            edit_clear_message = _("[{author}]({author_url}) edited the {field} on [{target}]({target_url})'s profile. *({desc})*")
+        content = edit_clear_message.format(author=author, author_url=author_url, target=sanitize_to_markdown(target_user), target_url=link,
+            field=profile_field_name(change["logparams"]['4:section'], False), desc=ctx.parsedcomment)
+    else:
+        if ctx.parsedcomment is None:  # If the field is empty
+            edit_clear_message = _("[{author}]({author_url}) cleared the {field} on [their own]({target_url}) profile.")
+        else:
+            edit_clear_message = _("[{author}]({author_url}) edited the {field} on [their own]({target_url}) profile. *({desc})*")
+        content = edit_clear_message.format(author=author, author_url=author_url, target_url=link,
+            field=profile_field_name(change["logparams"]['4:section'], False), desc=ctx.parsedcomment)
+    return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content)
+
+
+# curseprofile/comment-created - Creating comment on user profile
+
+
+@formatter.embed(event="curseprofile/comment-created")
+def embed_curseprofile_comment_created(ctx: Context, change: dict) -> DiscordMessage:
+    embed = DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url)
+    embed_helper(ctx, embed, change)
+    target_user = change["title"].split(':', 1)[1]
+    if target_user != change["user"]:
+        embed["title"] = _("Left a comment on {target}'s profile").format(target=sanitize_to_markdown(target_user))
+    else:
+        embed["title"] = _("Left a comment on their own profile")
+    if settings["appearance"]["embed"]["show_edit_changes"]:
+        embed["description"] = ctx.client.pull_curseprofile_comment(change["logparams"]["4:comment_id"])
+    embed["url"] = create_article_path("Special:CommentPermalink/{commentid}".format(commentid=change["logparams"]["4:comment_id"]))
+    return embed
+
+
+@formatter.compact(event="curseprofile/comment-created")
+def compact_curseprofile_comment_created(ctx: Context, change: dict) -> DiscordMessage:
+    author, author_url = compact_author(ctx, change)
+    target_user = change["title"].split(':', 1)[1]
+    link = clean_link(create_article_path("Special:CommentPermalink/{commentid}".format(commentid=change["logparams"]["4:comment_id"])))
+    if target_user != author:
+        content = _("[{author}]({author_url}) left a [comment]({comment}) on {target}'s profile.").format(
+            author=author, author_url=author_url, comment=link, target=sanitize_to_markdown(target_user))
+    else:
+        content = _("[{author}]({author_url}) left a [comment]({comment}) on their own profile.").format(author=author, author_url=author_url, comment=link)
+    return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content)
+
+
+# curseprofile/comment-edited - Editing comment on user profile
+
+
+@formatter.embed(event="curseprofile/comment-edited")
+def embed_curseprofile_comment_edited(ctx: Context, change: dict) -> DiscordMessage:
+    embed = DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url)
+    embed_helper(ctx, embed, change)
+    target_user = change["title"].split(':', 1)[1]
+    if target_user != change["user"]:
+        embed["title"] = _("Edited a comment on {target}'s profile").format(target=sanitize_to_markdown(target_user))
+    else:
+        embed["title"] = _("Edited a comment on their own profile")
+    if settings["appearance"]["embed"]["show_edit_changes"]:
+        embed["description"] = ctx.client.pull_curseprofile_comment(change["logparams"]["4:comment_id"])
+    embed["url"] = create_article_path("Special:CommentPermalink/{commentid}".format(commentid=change["logparams"]["4:comment_id"]))
+    return embed
+
+
+@formatter.compact(event="curseprofile/comment-edited")
+def compact_curseprofile_comment_edited(ctx: Context, change: dict) -> DiscordMessage:
+    author, author_url = compact_author(ctx, change)
+    target_user = change["title"].split(':', 1)[1]
+    link = clean_link(create_article_path("Special:CommentPermalink/{commentid}".format(commentid=change["logparams"]["4:comment_id"])))
+    if target_user != author:
+        content = _("[{author}]({author_url}) edited a [comment]({comment}) on {target}'s profile.").format(
+            author=author, author_url=author_url, comment=link, target=sanitize_to_markdown(target_user))
+    else:
+        content = _("[{author}]({author_url}) edited a [comment]({comment}) on their own profile.").format(author=author, author_url=author_url, comment=link)
+    return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content)
+
+
+# curseprofile/comment-replied - Replying to comment on user profile
+
+
+@formatter.embed(event="curseprofile/comment-replied")
+def embed_curseprofile_comment_replied(ctx: Context, change: dict) -> DiscordMessage:
+    embed = DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url)
+    embed_helper(ctx, embed, change)
+    target_user = change["title"].split(':', 1)[1]
+    if target_user != change["user"]:
+        embed["title"] = _("Replied to a comment on {target}'s profile").format(target=sanitize_to_markdown(target_user))
+    else:
+        embed["title"] = _("Replied to a comment on their own profile")
+    if settings["appearance"]["embed"]["show_edit_changes"]:
+        embed["description"] = ctx.client.pull_curseprofile_comment(change["logparams"]["4:comment_id"])
+    embed["url"] = create_article_path("Special:CommentPermalink/{commentid}".format(commentid=change["logparams"]["4:comment_id"]))
+    return embed
+
+
+@formatter.compact(event="curseprofile/comment-replied")
+def compact_curseprofile_comment_replied(ctx: Context, change: dict) -> DiscordMessage:
+    author, author_url = compact_author(ctx, change)
+    target_user = change["title"].split(':', 1)[1]
+    link = clean_link(create_article_path("Special:CommentPermalink/{commentid}".format(commentid=change["logparams"]["4:comment_id"])))
+    if target_user != author:
+        content = _("[{author}]({author_url}) replied to a [comment]({comment}) on {target}'s profile.").format(
+            author=author, author_url=author_url, comment=link, target=sanitize_to_markdown(target_user))
+    else:
+        content = _("[{author}]({author_url}) replied to a [comment]({comment}) on their own profile.").format(author=author, author_url=author_url, comment=link)
+    return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content)
+
+
+# curseprofile/comment-deleted - Deleting comment on user profile
+
+
+@formatter.embed(event="curseprofile/comment-deleted")
+def embed_curseprofile_comment_deleted(ctx: Context, change: dict) -> DiscordMessage:
+    embed = DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url)
+    embed_helper(ctx, embed, change)
+    target_user = change["title"].split(':', 1)[1]
+    if target_user != change["user"]:
+        embed["title"] = _("Deleted a comment on {target}'s profile").format(target=sanitize_to_markdown(target_user))
+    else:
+        embed["title"] = _("Deleted a comment on their own profile")
+    if ctx.parsedcomment is not None:
+        embed["description"] = ctx.parsedcomment
+    if "4:comment_id" in change["logparams"]:
+        embed["url"] = create_article_path("Special:CommentPermalink/{commentid}".format(commentid=change["logparams"]["4:comment_id"]))
+    else:
+        embed["url"] = create_article_path("UserProfile:" + sanitize_to_url(target_user))
+    return embed
+
+
+@formatter.compact(event="curseprofile/comment-deleted")
+def compact_curseprofile_comment_deleted(ctx: Context, change: dict) -> DiscordMessage:
+    author, author_url = compact_author(ctx, change)
+    target_user = change["title"].split(':', 1)[1]
+    if "4:comment_id" in change["logparams"]:
+        link = clean_link(create_article_path("Special:CommentPermalink/{commentid}".format(commentid=change["logparams"]["4:comment_id"])))
+    else:
+        link = clean_link(create_article_path("UserProfile:" + sanitize_to_url(target_user)))
+    parsed_comment = "" if ctx.parsedcomment is None else " *(" + ctx.parsedcomment + ")*"
+    if target_user != author:
+        content = _("[{author}]({author_url}) deleted a [comment]({comment}) on {target}'s profile.{reason}").format(
+            author=author, author_url=author_url, comment=link, target=sanitize_to_markdown(target_user), reason=parsed_comment)
+    else:
+        content = _("[{author}]({author_url}) deleted a [comment]({comment}) on their own profile.{reason}").format(
+            author=author, author_url=author_url, comment=link, reason=parsed_comment)
+    return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content)
+
+
+# curseprofile/comment-purged - Purging comment on user profile
+
+
+@formatter.embed(event="curseprofile/comment-purged")
+def embed_curseprofile_comment_purged(ctx: Context, change: dict) -> DiscordMessage:
+    embed = DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url)
+    embed_helper(ctx, embed, change)
+    target_user = change["title"].split(':', 1)[1]
+    if target_user != change["user"]:
+        embed["title"] = _("Purged a comment on {target}'s profile").format(target=sanitize_to_markdown(target_user))
+    else:
+        embed["title"] = _("Purged a comment on their own profile")
+    if ctx.parsedcomment is not None:
+        embed["description"] = ctx.parsedcomment
+    embed["url"] = create_article_path("UserProfile:" + sanitize_to_url(target_user))
+    return embed
+
+
+@formatter.compact(event="curseprofile/comment-purged")
+def compact_curseprofile_comment_purged(ctx: Context, change: dict) -> DiscordMessage:
+    author, author_url = compact_author(ctx, change)
+    target_user = change["title"].split(':', 1)[1]
+    link = clean_link(create_article_path("UserProfile:" + sanitize_to_url(target_user)))
+    parsed_comment = "" if ctx.parsedcomment is None else " *(" + ctx.parsedcomment + ")*"
+    if target_user != author:
+        content = _("[{author}]({author_url}) purged a comment on [{target}]({link})'s profile.{reason}").format(
+            author=author, author_url=author_url, link=link, target=sanitize_to_markdown(target_user), reason=parsed_comment)
+    else:
+        content = _("[{author}]({author_url}) purged a comment on [their own]({link}) profile.{reason}").format(author=author, author_url=author_url, link=link)
+    return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content, reason=parsed_comment)
diff --git a/extensions/base/interwiki.py b/extensions/base/interwiki.py
new file mode 100644
index 0000000..99477b9
--- /dev/null
+++ b/extensions/base/interwiki.py
@@ -0,0 +1,108 @@
+#  This file is part of Recent changes Goat compatible Discord webhook (RcGcDw).
+#
+#  RcGcDw is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  RcGcDw is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with RcGcDw.  If not, see <http://www.gnu.org/licenses/>.
+
+
+import logging
+from src.discord.message import DiscordMessage
+from src.api import formatter
+from src.i18n import rc_formatters
+from src.api.context import Context
+from src.api.util import embed_helper, clean_link, compact_author, create_article_path, sanitize_to_url
+
+_ = rc_formatters.gettext
+ngettext = rc_formatters.ngettext
+
+
+# Interwiki - https://www.mediawiki.org/wiki/Extension:Interwiki
+# interwiki/iw_add - Added entry to interwiki table
+
+
+@formatter.embed(event="interwiki/iw_add", mode="embed")
+def embed_interwiki_iw_add(ctx: Context, change: dict) -> DiscordMessage:
+    embed = DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url)
+    embed_helper(ctx, embed, change, set_desc=False)
+    embed["url"] = create_article_path("Special:Interwiki")
+    embed["title"] = _("Added an entry to the interwiki table")
+    embed["description"] = _("Prefix: {prefix}, website: {website} | {desc}").format(desc=ctx.parsedcomment,
+                                                                                     prefix=change["logparams"]['0'],
+                                                                                     website=change["logparams"]['1'])
+    return embed
+
+
+@formatter.compact(event="interwiki/iw_add")
+def compact_interwiki_iw_add(ctx: Context, change: dict) -> DiscordMessage:
+    author, author_url = compact_author(ctx, change)
+    link = clean_link(create_article_path("Special:Interwiki"))
+    parsed_comment = "" if ctx.parsedcomment is None else " *(" + ctx.parsedcomment + ")*"
+    content = _(
+        "[{author}]({author_url}) added an entry to the [interwiki table]({table_url}) pointing to {website} with {prefix} prefix").format(
+        author=author, author_url=author_url, desc=parsed_comment, prefix=change["logparams"]['0'],
+        website=change["logparams"]['1'], table_url=link)
+    return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content)
+
+
+# interwiki/iw_edit - Editing interwiki entry
+
+
+@formatter.embed(event="interwiki/iw_edit", mode="embed")
+def embed_interwiki_iw_edit(ctx: Context, change: dict) -> DiscordMessage:
+    embed = DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url)
+    embed_helper(ctx, embed, change, set_desc=False)
+    embed["url"] = create_article_path("Special:Interwiki")
+    embed["title"] = _("Edited an entry in interwiki table")
+    embed["description"] = _("Prefix: {prefix}, website: {website} | {desc}").format(desc=ctx.parsedcomment,
+                                                                                     prefix=change["logparams"]['0'],
+                                                                                     website=change["logparams"]['1'])
+    return embed
+
+
+@formatter.compact(event="interwiki/iw_edit")
+def compact_interwiki_iw_edit(ctx: Context, change: dict) -> DiscordMessage:
+    author, author_url = compact_author(ctx, change)
+    link = clean_link(create_article_path("Special:Interwiki"))
+    parsed_comment = "" if ctx.parsedcomment is None else " *(" + ctx.parsedcomment + ")*"
+    content = _(
+        "[{author}]({author_url}) edited an entry in [interwiki table]({table_url}) pointing to {website} with {prefix} prefix").format(
+        author=author, author_url=author_url, desc=parsed_comment, prefix=change["logparams"]['0'],
+        website=change["logparams"]['1'], table_url=link)
+    return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content)
+
+
+# interwiki/iw_delete - Deleting interwiki entry
+
+
+@formatter.embed(event="interwiki/iw_delete", mode="embed")
+def embed_interwiki_iw_delete(ctx: Context, change: dict) -> DiscordMessage:
+    embed = DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url)
+    embed_helper(ctx, embed, change, set_desc=False)
+    embed["url"] = create_article_path("Special:Interwiki")
+    embed["title"] = _("Deleted an entry in interwiki table")
+    embed["description"] = _("Prefix: {prefix} | {desc}").format(desc=ctx.parsedcomment,
+                                                                 prefix=change["logparams"]['0'])
+    return embed
+
+
+@formatter.compact(event="interwiki/iw_delete")
+def compact_interwiki_iw_delete(ctx: Context, change: dict) -> DiscordMessage:
+    author, author_url = compact_author(ctx, change)
+    link = clean_link(create_article_path("Special:Interwiki"))
+    parsed_comment = "" if ctx.parsedcomment is None else " *(" + ctx.parsedcomment + ")*"
+    content = _("[{author}]({author_url}) deleted an entry in [interwiki table]({table_url}){desc}").format(
+        author=author,
+        author_url=author_url,
+        table_url=link,
+        desc=parsed_comment)
+
+    return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content)
diff --git a/extensions/base/mediawiki.py b/extensions/base/mediawiki.py
index 6acc780..3f1218e 100644
--- a/extensions/base/mediawiki.py
+++ b/extensions/base/mediawiki.py
@@ -998,88 +998,6 @@ def compact_newusers_newusers(ctx, change):
     return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content)
 
 
-# interwiki/iw_add - Added entry to interwiki table
-
-
-@formatter.embed(event="interwiki/iw_add", mode="embed")
-def embed_interwiki_iw_add(ctx, change):
-    embed = DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url)
-    embed_helper(ctx, embed, change, set_desc=False)
-    embed["url"] = create_article_path("Special:Interwiki")
-    embed["title"] = _("Added an entry to the interwiki table")
-    embed["description"] = _("Prefix: {prefix}, website: {website} | {desc}").format(desc=ctx.parsedcomment,
-                                                                                     prefix=change["logparams"]['0'],
-                                                                                     website=change["logparams"]['1'])
-    return embed
-
-
-@formatter.compact(event="interwiki/iw_add")
-def compact_interwiki_iw_add(ctx, change):
-    author, author_url = compact_author(ctx, change)
-    link = clean_link(create_article_path("Special:Interwiki"))
-    parsed_comment = compact_summary(ctx)
-    content = _(
-        "[{author}]({author_url}) added an entry to the [interwiki table]({table_url}) pointing to {website} with {prefix} prefix").format(
-        author=author, author_url=author_url, desc=parsed_comment, prefix=change["logparams"]['0'],
-        website=change["logparams"]['1'], table_url=link)
-    return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content)
-
-
-# interwiki/iw_edit - Editing interwiki entry
-
-
-@formatter.embed(event="interwiki/iw_edit", mode="embed")
-def embed_interwiki_iw_edit(ctx, change):
-    embed = DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url)
-    embed_helper(ctx, embed, change, set_desc=False)
-    embed["url"] = create_article_path("Special:Interwiki")
-    embed["title"] = _("Edited an entry in interwiki table")
-    embed["description"] = _("Prefix: {prefix}, website: {website} | {desc}").format(desc=ctx.parsedcomment,
-                                                                                     prefix=change["logparams"]['0'],
-                                                                                     website=change["logparams"]['1'])
-    return embed
-
-
-@formatter.compact(event="interwiki/iw_edit")
-def compact_interwiki_iw_edit(ctx, change):
-    author, author_url = compact_author(ctx, change)
-    link = clean_link(create_article_path("Special:Interwiki"))
-    parsed_comment = compact_summary(ctx)
-    content = _(
-        "[{author}]({author_url}) edited an entry in [interwiki table]({table_url}) pointing to {website} with {prefix} prefix").format(
-        author=author, author_url=author_url, desc=parsed_comment, prefix=change["logparams"]['0'],
-        website=change["logparams"]['1'], table_url=link)
-    return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content)
-
-
-# interwiki/iw_delete - Deleting interwiki entry
-
-
-@formatter.embed(event="interwiki/iw_delete", mode="embed")
-def embed_interwiki_iw_delete(ctx, change):
-    embed = DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url)
-    embed_helper(ctx, embed, change, set_desc=False)
-    embed["url"] = create_article_path("Special:Interwiki")
-    embed["title"] = _("Deleted an entry in interwiki table")
-    embed["description"] = _("Prefix: {prefix} | {desc}").format(desc=ctx.parsedcomment,
-                                                                 prefix=change["logparams"]['0'])
-    return embed
-
-
-@formatter.compact(event="interwiki/iw_delete")
-def compact_interwiki_iw_delete(ctx, change):
-    author, author_url = compact_author(ctx, change)
-    link = clean_link(create_article_path("Special:Interwiki"))
-    parsed_comment = compact_summary(ctx)
-    content = _("[{author}]({author_url}) deleted an entry in [interwiki table]({table_url}){desc}").format(
-        author=author,
-        author_url=author_url,
-        table_url=link,
-        desc=parsed_comment)
-
-    return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content)
-
-
 # contentmodel/change - Changing the content model of a page
 
 
@@ -1264,47 +1182,3 @@ def compact_managetags_deactivate(ctx, change):
                                                                                                        tag_url=link,
                                                                                                        comment=parsed_comment)
     return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content)
-
-
-# renameuser/renameuser - Renaming a user
-
-
-@formatter.embed(event="renameuser/renameuser")
-def embed_renameuser_renameuser(ctx, change):
-    embed = DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url)
-    embed_helper(ctx, embed, change)
-    edits = change["logparams"]["edits"]
-    if edits > 0:
-        embed["title"] = ngettext("Renamed user \"{old_name}\" with {edits} edit to \"{new_name}\"",
-                                  "Renamed user \"{old_name}\" with {edits} edits to \"{new_name}\"", edits).format(
-            old_name=sanitize_to_markdown(change["logparams"]["olduser"]), edits=edits,
-            new_name=sanitize_to_markdown(change["logparams"]["newuser"]))
-    else:
-        embed["title"] = _("Renamed user \"{old_name}\" to \"{new_name}\"").format(
-            old_name=sanitize_to_markdown(change["logparams"]["olduser"]),
-            new_name=sanitize_to_markdown(change["logparams"]["newuser"]))
-    embed["url"] = create_article_path("User:" + sanitize_to_url(change["logparams"]["newuser"]))
-    return embed
-
-
-@formatter.compact(event="renameuser/renameuser")
-def compact_renameuser_renameuser(ctx, change):
-    author, author_url = compact_author(ctx, change)
-    link = clean_link(create_article_path("User:" + sanitize_to_url(change["logparams"]["newuser"])))
-    edits = change["logparams"]["edits"]
-    parsed_comment = compact_summary(ctx)
-    if edits > 0:
-        content = ngettext(
-            "[{author}]({author_url}) renamed user *{old_name}* with {edits} edit to [{new_name}]({link}){comment}",
-            "[{author}]({author_url}) renamed user *{old_name}* with {edits} edits to [{new_name}]({link}){comment}",
-            edits).format(
-            author=author, author_url=author_url, old_name=sanitize_to_markdown(change["logparams"]["olduser"]),
-            edits=edits,
-            new_name=sanitize_to_markdown(change["logparams"]["newuser"]), link=link, comment=parsed_comment
-        )
-    else:
-        content = _("[{author}]({author_url}) renamed user *{old_name}* to [{new_name}]({link}){comment}").format(
-            author=author, author_url=author_url, old_name=sanitize_to_markdown(change["logparams"]["olduser"]),
-            new_name=sanitize_to_markdown(change["logparams"]["newuser"]), link=link, comment=parsed_comment
-        )
-    return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content)
diff --git a/extensions/base/renameuser.py b/extensions/base/renameuser.py
new file mode 100644
index 0000000..fa2aad4
--- /dev/null
+++ b/extensions/base/renameuser.py
@@ -0,0 +1,70 @@
+#  This file is part of Recent changes Goat compatible Discord webhook (RcGcDw).
+#
+#  RcGcDw is free software: you can redistribute it and/or modify
+#  it under the terms of the GNU General Public License as published by
+#  the Free Software Foundation, either version 3 of the License, or
+#  (at your option) any later version.
+#
+#  RcGcDw is distributed in the hope that it will be useful,
+#  but WITHOUT ANY WARRANTY; without even the implied warranty of
+#  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#  GNU General Public License for more details.
+#
+#  You should have received a copy of the GNU General Public License
+#  along with RcGcDw.  If not, see <http://www.gnu.org/licenses/>.
+
+
+import logging
+from src.discord.message import DiscordMessage
+from src.api import formatter
+from src.i18n import rc_formatters
+from src.api.context import Context
+from src.api.util import embed_helper, clean_link, compact_author, create_article_path, sanitize_to_markdown, sanitize_to_url
+
+_ = rc_formatters.gettext
+ngettext = rc_formatters.ngettext
+
+
+# Renameuser - https://www.mediawiki.org/wiki/Extension:Renameuser
+# renameuser/renameuser - Renaming a user
+
+
+@formatter.embed(event="renameuser/renameuser")
+def embed_renameuser_renameuser(ctx: Context, change: dict) -> DiscordMessage:
+    embed = DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url)
+    embed_helper(ctx, embed, change)
+    edits = change["logparams"]["edits"]
+    if edits > 0:
+        embed["title"] = ngettext("Renamed user \"{old_name}\" with {edits} edit to \"{new_name}\"",
+                                  "Renamed user \"{old_name}\" with {edits} edits to \"{new_name}\"", edits).format(
+            old_name=sanitize_to_markdown(change["logparams"]["olduser"]), edits=edits,
+            new_name=sanitize_to_markdown(change["logparams"]["newuser"]))
+    else:
+        embed["title"] = _("Renamed user \"{old_name}\" to \"{new_name}\"").format(
+            old_name=sanitize_to_markdown(change["logparams"]["olduser"]),
+            new_name=sanitize_to_markdown(change["logparams"]["newuser"]))
+    embed["url"] = create_article_path("User:" + sanitize_to_url(change["logparams"]["newuser"]))
+    return embed
+
+
+@formatter.compact(event="renameuser/renameuser")
+def compact_renameuser_renameuser(ctx: Context, change: dict) -> DiscordMessage:
+    author, author_url = compact_author(ctx, change)
+    link = clean_link(create_article_path("User:" + sanitize_to_url(change["logparams"]["newuser"])))
+    edits = change["logparams"]["edits"]
+    parsed_comment = "" if ctx.parsedcomment is None else " *(" + ctx.parsedcomment + ")*"
+    if edits > 0:
+        content = ngettext(
+            "[{author}]({author_url}) renamed user *{old_name}* with {edits} edit to [{new_name}]({link}){comment}",
+            "[{author}]({author_url}) renamed user *{old_name}* with {edits} edits to [{new_name}]({link}){comment}",
+            edits).format(
+            author=author, author_url=author_url, old_name=sanitize_to_markdown(change["logparams"]["olduser"]),
+            edits=edits,
+            new_name=sanitize_to_markdown(change["logparams"]["newuser"]), link=link, comment=parsed_comment
+        )
+    else:
+        content = _("[{author}]({author_url}) renamed user *{old_name}* to [{new_name}]({link}){comment}").format(
+            author=author, author_url=author_url, old_name=sanitize_to_markdown(change["logparams"]["olduser"]),
+            new_name=sanitize_to_markdown(change["logparams"]["newuser"]), link=link, comment=parsed_comment
+        )
+    return DiscordMessage(ctx.message_type, ctx.event, ctx.webhook_url, content=content)