diff --git a/components/Avatar/Controller/Avatar.php b/components/Avatar/Controller/Avatar.php
index 678af08010..0c0175ea81 100644
--- a/components/Avatar/Controller/Avatar.php
+++ b/components/Avatar/Controller/Avatar.php
@@ -68,7 +68,7 @@ class Avatar extends Controller
             ['avatar', FileType::class, ['label' => _m('Avatar'), 'help' => _m('You can upload your personal avatar. The maximum file size is 2MB.'), 'multiple' => false, 'required' => false]],
             ['remove', CheckboxType::class, ['label' => _m('Remove avatar'), 'help' => _m('Remove your avatar and use the default one'), 'required' => false, 'value' => false]],
             ['hidden', HiddenType::class, []],
-            ['save', SubmitType::class, ['label' => _m('Submit')]],
+            ['save_avatar', SubmitType::class, ['label' => _m('Submit')]],
         ]);
 
         $form->handleRequest($request);
diff --git a/components/Posting/Posting.php b/components/Posting/Posting.php
index e5a99fb05d..26f197f87a 100644
--- a/components/Posting/Posting.php
+++ b/components/Posting/Posting.php
@@ -82,7 +82,7 @@ END;
             ['attachments', FileType::class,     ['label' => ' ', 'data' => null, 'multiple' => true, 'required' => false]],
             ['visibility',  ChoiceType::class,   ['label' => _m('Visibility:'), 'expanded' => true, 'data' => 'public', 'choices' => [_m('Public') => 'public', _m('Instance') => 'instance', _m('Private') => 'private']]],
             ['to',          ChoiceType::class,   ['label' => _m('To:'), 'multiple' => true, 'expanded' => true, 'choices' => $to_tags]],
-            ['post',        SubmitType::class,   ['label' => _m('Post')]],
+            ['post_note',   SubmitType::class,   ['label' => _m('Post')]],
         ]);
 
         $form->handleRequest($request);
diff --git a/plugins/Cover/Controller/Cover.php b/plugins/Cover/Controller/Cover.php
index 4ef037df75..3db849f249 100644
--- a/plugins/Cover/Controller/Cover.php
+++ b/plugins/Cover/Controller/Cover.php
@@ -82,7 +82,7 @@ class Cover
                         'mimeTypesMessage' => 'Please upload a valid image',
                     ]), ], ]],
             ['hidden', HiddenType::class, []],
-            ['save',   SubmitType::class, ['label' => _m('Submit')]],
+            ['save_color',   SubmitType::class, ['label' => _m('Submit')]],
         ]);
 
         $form->handleRequest($request);
diff --git a/plugins/ProfileColor/Controller/ProfileColor.php b/plugins/ProfileColor/Controller/ProfileColor.php
index 0011d154ca..6865162e5d 100644
--- a/plugins/ProfileColor/Controller/ProfileColor.php
+++ b/plugins/ProfileColor/Controller/ProfileColor.php
@@ -66,7 +66,7 @@ class ProfileColor
         $form = Form::create([
             ['color',   ColorType::class,   ['data' => $color, 'label' => _m('Profile Color'), 'help' => _m('Choose your Profile Color')] ],
             ['hidden', HiddenType::class, []],
-            ['save',   SubmitType::class, ['label' => _m('Submit')]],
+            ['save_profile_color',   SubmitType::class, ['label' => _m('Submit')]],
         ]);
 
         $form->handleRequest($request);
diff --git a/src/Controller/AdminPanel.php b/src/Controller/AdminPanel.php
index 231b1cd61d..b03c6ddd00 100644
--- a/src/Controller/AdminPanel.php
+++ b/src/Controller/AdminPanel.php
@@ -64,7 +64,7 @@ class AdminPanel extends Controller
         $form = Form::create([
             ['setting', ChoiceType::class, ['label' => _m('Setting'), 'choices' => $options]],
             ['value',   TextType::class,   ['label' => _m('Value')]],
-            ['save',    SubmitType::class, ['label' => _m('Set site setting')]],
+            ['save_admin',    SubmitType::class, ['label' => _m('Set site setting')]],
         ]);
 
         $form->handleRequest($request);
diff --git a/src/Controller/UserPanel.php b/src/Controller/UserPanel.php
index 403abc76f1..28dbcc331d 100644
--- a/src/Controller/UserPanel.php
+++ b/src/Controller/UserPanel.php
@@ -100,7 +100,7 @@ class UserPanel extends AbstractController
             ['bio',        TextareaType::class,  ['label' => _m('Bio'),       'required' => false, 'help' => _m('Describe yourself and your interests.')]],
             ['location',   TextType::class,      ['label' => _m('Location'),  'required' => false, 'help' => _m('Where you are, like "City, State (or Region), Country".')]],
             ['self_tags',  TextType::class,      ['label' => _m('Self Tags'), 'required' => false, 'help' => _m('Tags for yourself (letters, numbers, -, ., and _), comma- or space-separated.'), 'transformer' => ArrayTransformer::class]],
-            ['save',       SubmitType::class,    ['label' => _m('Save personal info')]],
+            ['save_personal_info',       SubmitType::class,    ['label' => _m('Save personal info')]],
         ];
         $extra_step = function ($data, $extra_args) use ($user) {
             $user->setNickname($data['nickname']);
@@ -124,7 +124,7 @@ class UserPanel extends AbstractController
             FormFields::repeated_password(['required' => false]),
             ['language',       LocaleType::class,      ['label' => _m('Language'),       'required' => false, 'help' => _m('Your preferred language')]],
             ['phone_number',   PhoneNumberType::class, ['label' => _m('Phone number'),   'required' => false, 'help' => _m('Your phone number'),                        'data_class' => null]],
-            ['save',           SubmitType::class,      ['label' => _m('Save account info')]],
+            ['save_account_info',           SubmitType::class,      ['label' => _m('Save account info')]],
         ]);
 
         $form->handleRequest($request);
diff --git a/templates/sidepanel/right/right.html.twig b/templates/sidepanel/right/right.html.twig
index 3ca5425017..a027308eb1 100644
--- a/templates/sidepanel/right/right.html.twig
+++ b/templates/sidepanel/right/right.html.twig
@@ -28,7 +28,7 @@
                     {{ form_widget(post_form.attachments) }}
                 </label>
 
-                {{ form_row(post_form.post, {'attr': {'class': 'section-form-send'}}) }}
+                {{ form_row(post_form.post_note, {'attr': {'class': 'section-form-send'}}) }}
 
                 {{ form_end(post_form) }}
             </div>