diff --git a/Dnn.CommunityForums/config/templates/ReplyEditor.ascx b/Dnn.CommunityForums/config/templates/ReplyEditor.ascx
index e47d3ea4a..55124fbd0 100644
--- a/Dnn.CommunityForums/config/templates/ReplyEditor.ascx
+++ b/Dnn.CommunityForums/config/templates/ReplyEditor.ascx
@@ -73,26 +73,26 @@
 									<table width="100%" style="background-color:#fff;border-top:solid 1px #cdcdcd;" cellspacing="0" cellpadding="4">
 										[TOPIC]
 											<tr>
-												<td valign="top" class="[POSTINFOCSS]" height="100">[POSTINFO]<br />[SPACER:1:125]</td>
+												<td valign="top" class="[POSTINFOCSS]" height="100">[DCF:TEMPLATE-PROFILEINFO]<br />[SPACER:1:125]</td>
 												<td valign="top" class="[POSTREPLYCSS]" width="100%">
 													<table cellpadding="4" cellspacing="0" border="0" width="100%">
 														<tr>
-															<td class="afsubrow"><a name="[POSTID]"></a>[POSTDATE]</td>
+															<td class="afsubrow"><a name="[FORUMPOST:POSTID]"></a>[FORUMPOST:DATECREATED]</td>
 															<td class="afsubrow" align=right valign=top>
 															
 															</td>
 														</tr>
 														<tr>
-															<td colspan="2" class="afpostbody">[AF:CONTROL:POLL][BODY]</td>
+															<td colspan="2" class="afpostbody">[AF:CONTROL:POLL][FORUMPOST:BODY]</td>
 														</tr>
 														<tr>
 															<td colspan="2" class="afpostattach">[ATTACHMENTS]</td>
 														</tr>
 														<tr>
-															<td colspan="2" class="afpostsig">[SIGNATURE]</td>
+															<td colspan="2" class="afpostsig">[FORUMAUTHOR:SIGNATURE]</td>
 														</tr>
 														<tr>
-															<td colspan="2" class="afposteditdate" align="right">[MODEDITDATE]</td>
+															<td colspan="2" class="afposteditdate" align="right">[FORUMPOST:MODEDITDATE]</td>
 														</tr>
 													</table>				
 												</td>
@@ -100,26 +100,26 @@
 											[/TOPIC]
 											[REPLIES]
 											<tr>
-												<td valign="top" class="[POSTINFOCSS]" height="100">[POSTINFO]<br />[SPACER:1:125]</td>
+												<td valign="top" class="[POSTINFOCSS]" height="100">[DCF:TEMPLATE-PROFILEINFO]<br />[SPACER:1:125]</td>
 												<td valign="top" class="[POSTREPLYCSS]" width="100%">
 													<table cellpadding="4" cellspacing="0" border="0" width="100%">
 														<tr>
-															<td class="afsubrow"><a name="[POSTID]"></a>[POSTDATE]</td>
+															<td class="afsubrow"><a name="[FORUMPOST:POSTID]"></a>[FORUMPOST:DATECREATED]</td>
 															<td class="afsubrow" align="right">
 																
 															</td>
 														</tr>
 														<tr>
-															<td colspan="2" class="afpostbody">[BODY]</td>
+															<td colspan="2" class="afpostbody">[FORUMPOST:BODY]</td>
 														</tr>
 														<tr>
 															<td colspan="2" class="afpostattach">[ATTACHMENTS]</td>
 														</tr>
 														<tr>
-															<td colspan="2" class="afpostsig">[SIGNATURE]</td>
+															<td colspan="2" class="afpostsig">[FORUMAUTHOR:SIGNATURE]</td>
 														</tr>
 														<tr>
-															<td colspan="2" class="afposteditdate" align="right">[MODEDITDATE]</td>
+															<td colspan="2" class="afposteditdate" align="right">[FORUMPOST:MODEDITDATE]</td>
 														</tr>
 													</table>				
 												</td>
diff --git a/Dnn.CommunityForums/controls/af_post.ascx.cs b/Dnn.CommunityForums/controls/af_post.ascx.cs
index 6dac9857f..7ead546c1 100644
--- a/Dnn.CommunityForums/controls/af_post.ascx.cs
+++ b/Dnn.CommunityForums/controls/af_post.ascx.cs
@@ -539,6 +539,12 @@ private void PrepareReply()
             this.ctlForm.EditorMode = Modules.ActiveForums.Controls.SubmitForm.EditorModes.Reply;
 
             string template = TemplateCache.GetCachedTemplate(this.ForumModuleId, "ReplyEditor", this.fi.FeatureSettings.ReplyFormId);
+            
+#region "Backward compatilbility -- remove in v10.00.00"
+            template = DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.MapLegacyAuthorTokenSynonyms(new StringBuilder(template), this.PortalSettings, this.MainSettings, this.ForumUser.UserInfo?.Profile?.PreferredLocale).ToString();
+            template = DotNetNuke.Modules.ActiveForums.Services.Tokens.TokenReplacer.MapLegacyPostTokenSynonyms(new StringBuilder(template), this.PortalSettings, this.ForumUser.UserInfo?.Profile?.PreferredLocale).ToString();
+#endregion "Backward compatilbility -- remove in v10.00.00"
+
             if (this.isEdit)
             {
                 template = template.Replace("[RESX:ReplyToTopic]", "[RESX:EditingExistingReply]");
diff --git a/Dnn.CommunityForums/themes/community-bootstrap/templates/ReplyEditor.ascx b/Dnn.CommunityForums/themes/community-bootstrap/templates/ReplyEditor.ascx
index 1cef9f5b1..43e3eecb8 100644
--- a/Dnn.CommunityForums/themes/community-bootstrap/templates/ReplyEditor.ascx
+++ b/Dnn.CommunityForums/themes/community-bootstrap/templates/ReplyEditor.ascx
@@ -73,26 +73,26 @@
 									<table width="100%" style="background-color:#fff;border-top:solid 1px #cdcdcd;" cellspacing="0" cellpadding="4">
 										[TOPIC]
 											<tr>
-												<td valign="top" class="[POSTINFOCSS]" height="100">[POSTINFO]<br />[SPACER:1:125]</td>
+												<td valign="top" class="[POSTINFOCSS]" height="100">[DCF:TEMPLATE-PROFILEINFO]<br />[SPACER:1:125]</td>
 												<td valign="top" class="[POSTREPLYCSS]" width="100%">
 													<table cellpadding="4" cellspacing="0" border="0" width="100%">
 														<tr>
-															<td class="afsubrow"><a name="[POSTID]"></a>[POSTDATE]</td>
+															<td class="afsubrow"><a name="[FORUMPOST:POSTID]"></a>[FORUMPOST:DATECREATED]</td>
 															<td class="afsubrow" align=right valign=top>
 															
 															</td>
 														</tr>
 														<tr>
-															<td colspan="2" class="afpostbody">[AF:CONTROL:POLL][BODY]</td>
+															<td colspan="2" class="afpostbody">[AF:CONTROL:POLL][FORUMPOST:BODY]</td>
 														</tr>
 														<tr>
 															<td colspan="2" class="afpostattach">[ATTACHMENTS]</td>
 														</tr>
 														<tr>
-															<td colspan="2" class="afpostsig">[SIGNATURE]</td>
+															<td colspan="2" class="afpostsig">[FORUMAUTHOR:SIGNATURE]</td>
 														</tr>
 														<tr>
-															<td colspan="2" class="afposteditdate" align="right">[MODEDITDATE]</td>
+															<td colspan="2" class="afposteditdate" align="right">[FORUMPOST:MODEDITDATE]</td>
 														</tr>
 													</table>				
 												</td>
@@ -100,26 +100,26 @@
 											[/TOPIC]
 											[REPLIES]
 											<tr>
-												<td valign="top" class="[POSTINFOCSS]" height="100">[POSTINFO]<br />[SPACER:1:125]</td>
+												<td valign="top" class="[POSTINFOCSS]" height="100">[DCF:TEMPLATE-PROFILEINFO]<br />[SPACER:1:125]</td>
 												<td valign="top" class="[POSTREPLYCSS]" width="100%">
 													<table cellpadding="4" cellspacing="0" border="0" width="100%">
 														<tr>
-															<td class="afsubrow"><a name="[POSTID]"></a>[POSTDATE]</td>
+															<td class="afsubrow"><a name="[FORUMPOST:POSTID]"></a>[FORUMPOST:DATECREATED]</td>
 															<td class="afsubrow" align="right">
 																
 															</td>
 														</tr>
 														<tr>
-															<td colspan="2" class="afpostbody">[BODY]</td>
+															<td colspan="2" class="afpostbody">[FORUMPOST:BODY]</td>
 														</tr>
 														<tr>
 															<td colspan="2" class="afpostattach">[ATTACHMENTS]</td>
 														</tr>
 														<tr>
-															<td colspan="2" class="afpostsig">[SIGNATURE]</td>
+															<td colspan="2" class="afpostsig">[FORUMAUTHOR:SIGNATURE]</td>
 														</tr>
 														<tr>
-															<td colspan="2" class="afposteditdate" align="right">[MODEDITDATE]</td>
+															<td colspan="2" class="afposteditdate" align="right">[FORUMPOST:MODEDITDATE]</td>
 														</tr>
 													</table>				
 												</td>
diff --git a/Dnn.CommunityForums/themes/community-bootstrap/templates/TopicView.ascx b/Dnn.CommunityForums/themes/community-bootstrap/templates/TopicView.ascx
index 8d7b945b7..734891c51 100644
--- a/Dnn.CommunityForums/themes/community-bootstrap/templates/TopicView.ascx
+++ b/Dnn.CommunityForums/themes/community-bootstrap/templates/TopicView.ascx
@@ -64,7 +64,7 @@
 
 			
 						<div class="dcf-topic-info bg-light px-3 pb-2 mb-2 mb-md-0">
-							[POSTINFO]
+							[DCF:TEMPLATE-PROFILEINFO]
 						</div>
 
 					<div class="dcf-topic-content px-3">
@@ -111,7 +111,7 @@
 				<div class="d-flex flex-wrap">
 
 						<div class="dcf-topic-info bg-light px-3 pb-2  mb-2 mb-md-0">
-							[POSTINFO]
+							[DCF:TEMPLATE-PROFILEINFO]
 						</div>
 
 						<div class="dcf-topic-content px-3">
diff --git a/Dnn.CommunityForums/themes/community-default/templates/TopicView.ascx b/Dnn.CommunityForums/themes/community-default/templates/TopicView.ascx
index fae30fa26..c3d8350e2 100644
--- a/Dnn.CommunityForums/themes/community-default/templates/TopicView.ascx
+++ b/Dnn.CommunityForums/themes/community-default/templates/TopicView.ascx
@@ -61,7 +61,7 @@
 				<div class="dcf-cols">
 					<div class="dcf-col-25">
 						<div class="dcf-topic-info">
-							[POSTINFO]
+							[DCF:TEMPLATE-PROFILEINFO]
 						</div>
 					</div>
 					<div class="dcf-col-75">
@@ -118,7 +118,7 @@
 				<div class="dcf-cols">
 					<div class="dcf-col-25">
 						<div class="dcf-topic-info">
-							[POSTINFO]
+							[DCF:TEMPLATE-PROFILEINFO]
 						</div>
 					</div>
 					<div class="dcf-col-75">