diff --git a/pinaxcon/proposals/forms.py b/pinaxcon/proposals/forms.py
index d3892f87..b5968898 100644
--- a/pinaxcon/proposals/forms.py
+++ b/pinaxcon/proposals/forms.py
@@ -61,91 +61,91 @@ class MiniconfProposalForm(ProposalForm):
     pass
 
 
-class AIAndMachineLearningForm(MiniconfProposalForm):
+class AIAndMachineLearningProposalForm(MiniconfProposalForm):
     class Meta:
         model = models.AIAndMachineLearningProposal
         fields = TALK_FORMAT_FIELDS
 
 
-class DiversityEquityAndInclusionForm(MiniconfProposalForm):
+class DiversityEquityAndInclusionProposalForm(MiniconfProposalForm):
     class Meta:
         model = models.DiversityEquityAndInclusionProposal
         fields = TALK_FORMAT_FIELDS
 
 
-class FOSSAndARM64Form(MiniconfProposalForm):
+class FOSSAndARM64ProposalForm(MiniconfProposalForm):
     class Meta:
         model = models.FOSSAndARM64Proposal
         fields = TALK_FORMAT_FIELDS
 
 
-class FOSSFundingandEconomicsForm(MiniconfProposalForm):
+class FOSSFundingandEconomicsProposalForm(MiniconfProposalForm):
     class Meta:
         model = models.FOSSFundingandEconomicsProposal
         fields = TALK_FORMAT_FIELDS
 
 
-class FOSSInDailyLifeForm(MiniconfProposalForm):
+class FOSSInDailyLifeProposalForm(MiniconfProposalForm):
     class Meta:
         model = models.FOSSInDailyLifeProposal
         fields = TALK_FORMAT_FIELDS
 
 
-class FOSSInEducationForm(MiniconfProposalForm):
+class FOSSInEducationProposalForm(MiniconfProposalForm):
     class Meta:
         model = models.FOSSInEducationProposal
         fields = TALK_FORMAT_FIELDS
 
 
-class LicensingAndLegalIssuesForm(MiniconfProposalForm):
+class LicensingAndLegalIssuesProposalForm(MiniconfProposalForm):
     class Meta:
         model = models.LicensingAndLegalIssuesProposal
         fields = TALK_FORMAT_FIELDS
 
 
-class MobileDeviceUserFreedomForm(MiniconfProposalForm):
+class MobileDeviceUserFreedomProposalForm(MiniconfProposalForm):
     class Meta:
         model = models.MobileDeviceUserFreedomProposal
         fields = TALK_FORMAT_FIELDS
 
 
-class ReproducibilityForm(MiniconfProposalForm):
+class ReproducibilityProposalForm(MiniconfProposalForm):
     class Meta:
         model = models.ReproducibilityProposal
         fields = TALK_FORMAT_FIELDS
 
 
-class RightToRepairForm(MiniconfProposalForm):
+class RightToRepairProposalForm(MiniconfProposalForm):
     class Meta:
         model = models.RightToRepairProposal
         fields = TALK_FORMAT_FIELDS
 
 
-class ScienceOfCommunityForm(MiniconfProposalForm):
+class ScienceOfCommunityProposalForm(MiniconfProposalForm):
     class Meta:
         model = models.ScienceOfCommunityProposal
         fields = TALK_FORMAT_FIELDS
 
 
-class MemberProjectsForm(MiniconfProposalForm):
+class MemberProjectsProposalForm(MiniconfProposalForm):
     class Meta:
         model = models.MemberProjectsProposal
         fields = TALK_FORMAT_FIELDS
 
 
-class SupportingUserGroupsForm(MiniconfProposalForm):
+class SupportingUserGroupsProposalForm(MiniconfProposalForm):
     class Meta:
         model = models.SupportingUserGroupsProposal
         fields = TALK_FORMAT_FIELDS
 
 
-class XMPPForm(MiniconfProposalForm):
+class XMPPProposalForm(MiniconfProposalForm):
     class Meta:
         model = models.XMPPProposal
         fields = TALK_FORMAT_FIELDS
 
 
-class WildCardForm(MiniconfProposalForm):
+class WildCardProposalForm(MiniconfProposalForm):
     class Meta:
         model = models.WildCardProposal
         fields = TALK_FORMAT_FIELDS