diff --git a/app/views/console/database/index.phtml b/app/views/console/database/index.phtml
index 453c4c3406..480379e612 100644
--- a/app/views/console/database/index.phtml
+++ b/app/views/console/database/index.phtml
@@ -94,9 +94,6 @@
                         data-failure-param-alert-text="Failed to create collection"
                         data-failure-param-alert-classname="error">
 
-                        <label for="collection-name">Name</label>
-                        <input type="text" class="full-width" id="collection-name" name="name" required autocomplete="off" maxlength="128" />
-
                         <label for="collection-id">Collection ID</label>
                         <input
                             type="hidden"
@@ -105,6 +102,9 @@
                             required
                             maxlength="36"
                             name="collectionId" />
+                            
+                        <label for="collection-name">Name</label>
+                        <input type="text" class="full-width" id="collection-name" name="name" required autocomplete="off" maxlength="128" />
 
                         <input type="hidden" id="collection-read" name="read" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />
                         <input type="hidden" id="collection-write" name="write" required data-cast-to="json" value="<?php echo htmlentities(json_encode([])); ?>" />
diff --git a/app/views/console/functions/index.phtml b/app/views/console/functions/index.phtml
index 926ccd64e6..65a1792659 100644
--- a/app/views/console/functions/index.phtml
+++ b/app/views/console/functions/index.phtml
@@ -105,9 +105,6 @@ $runtimes = $this->getParam('runtimes', []);
                             data-failure="alert"
                             data-failure-param-alert-text="Failed to create function"
                             data-failure-param-alert-classname="error">
-                            <label for="name">Name</label>
-                            <input type="text" id="name" name="name" required autocomplete="off" class="margin-bottom" maxlength="128" />
-                            
                             <label for="functionId">Function ID</label>
                             <input 
                                 type="hidden"
@@ -117,6 +114,9 @@ $runtimes = $this->getParam('runtimes', []);
                                 maxlength="36"
                                 name="functionId" />
                             
+                            <label for="name">Name</label>
+                            <input type="text" id="name" name="name" required autocomplete="off" class="margin-bottom" maxlength="128" />
+                            
                             <label for="runtime">Runtimes</label>
                             <select name="runtime" id="runtime" required class="margin-bottom-xl">
                                 <?php foreach($runtimes as $key => $runtime): ?>
diff --git a/app/views/console/home/index.phtml b/app/views/console/home/index.phtml
index 515e4f8cfe..52c3fa2f0b 100644
--- a/app/views/console/home/index.phtml
+++ b/app/views/console/home/index.phtml
@@ -271,9 +271,6 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
         <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
         <input type="hidden" name="type" data-ls-bind="web" />
 
-        <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
-        <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My Web App" maxlength="128" />
-
         <label for="platformId">Platform ID <span class="tooltip large" data-tooltip="Choose an ID that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
         <input
             type="hidden"
@@ -284,6 +281,9 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
             name="platformId"
             placeholder="my_web_app" />
 
+        <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
+        <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My Web App" maxlength="128" />
+
         <label for="hostname">Hostname <span class="tooltip large" data-tooltip="The hostname that your website will use to interact with the <?php echo APP_NAME; ?> APIs in production or development environments. No port number required."><i class="icon-question"></i></span></label>
         <input name="hostname" type="text" class="margin-bottom" autocomplete="off" placeholder="localhost" required>
         
@@ -357,9 +357,6 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
         <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
         <input type="hidden" name="type" data-ls-bind="android" />
 
-        <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
-        <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My Android App" maxlength="128" />
-
         <label for="platformId">Platform ID <span class="tooltip large" data-tooltip="Choose an ID that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
         <input type="hidden"
             data-custom-id
@@ -369,6 +366,9 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
             name="platformId"
             placeholder="my_android_app" />
 
+        <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
+        <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My Android App" maxlength="128" />
+
         <label for="key">Package Name <span class="tooltip large" data-tooltip="Your package name is generally the applicationId in your app-level build.gradle file."><i class="icon-question"></i></span></label>
         <input type="text" class="full-width" name="key" required autocomplete="off" placeholder="com.company.appname" />
 
@@ -405,10 +405,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 
                 <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
                 <input type="hidden" name="type" data-ls-bind="flutter-ios" />
-
-                <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
-                <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My iOS App" maxlength="128" />
-
+                
                 <label for="platformId">Platform ID <span class="tooltip large" data-tooltip="Choose an ID that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
                 <input 
                     type="hidden"
@@ -418,6 +415,9 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                     maxlength="36"
                     name="platformId"
                     placeholder="my_flutter_ios_app" />
+                    
+                <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
+                <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My iOS App" maxlength="128" />
 
                 <label for="key">Bundle ID <span class="tooltip large" data-tooltip="You can find your Bundle Identifier in the General tab for your app's primary target in Xcode."><i class="icon-question"></i></span></label>
                 <input type="text" class="full-width" name="key" required autocomplete="off" placeholder="com.company.appname" />
@@ -449,10 +449,7 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
 
                 <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
                 <input type="hidden" name="type" data-ls-bind="flutter-android" />
-
-                <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
-                <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My Android App" maxlength="128" />
-
+                
                 <label for="platformId">Platform ID <span class="tooltip large" data-tooltip="Choose an ID that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
                 <input 
                     type="hidden"
@@ -463,6 +460,9 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                     name="platformId"
                     placeholder="my_flutter_android_app" />
 
+                <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
+                <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My Android App" maxlength="128" />
+
                 <label for="key">Package Name <span class="tooltip large" data-tooltip="Your package name is generally the applicationId in your app-level build.gradle file."><i class="icon-question"></i></span></label>
                 <input type="text" class="full-width" name="key" required autocomplete="off" placeholder="com.company.appname" />
 
@@ -493,9 +493,6 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                 <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
                 <input type="hidden" name="type" data-ls-bind="flutter-linux" />
 
-                <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
-                <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My Linux App" maxlength="128" />
-
                 <label for="platformId">Platform ID <span class="tooltip large" data-tooltip="Choose an ID that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
                 <input
                     type="hidden"
@@ -505,6 +502,9 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                     maxlength="36"
                     name="platformId"
                     placeholder="my_flutter_linux_app" />
+                    
+                <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
+                <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My Linux App" maxlength="128" />
 
                 <label for="key">Package Name <span class="tooltip large" data-tooltip="Your application name"><i class="icon-question"></i></span></label>
                 <input type="text" class="full-width" name="key" required autocomplete="off" placeholder="appname" />
@@ -536,9 +536,6 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                 <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
                 <input type="hidden" name="type" data-ls-bind="flutter-macos" />
 
-                <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
-                <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My Mac OS App" maxlength="128" />
-
                 <label for="platformId">Platform ID <span class="tooltip large" data-tooltip="Choose an ID that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
                 <input
                     type="hidden"
@@ -548,6 +545,9 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                     maxlength="36"
                     name="platformId"
                     placeholder="my_flutter_macos_app" />
+                    
+                <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
+                <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My Mac OS App" maxlength="128" />
 
                 <label for="key">Bundle ID <span class="tooltip large" data-tooltip="You can find your Bundle Identifier in the General tab for your app's primary target in Xcode."><i class="icon-question"></i></span></label>
                 <input type="text" class="full-width" name="key" required autocomplete="off" placeholder="com.company.appname" />
@@ -579,9 +579,6 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                 <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
                 <input type="hidden" name="type" data-ls-bind="flutter-windows" />
 
-                <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
-                <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My Windows App" maxlength="128" />
-
                 <label for="platformId">Platform ID <span class="tooltip large" data-tooltip="Choose an ID that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
                 <input
                     type="hidden"
@@ -591,6 +588,9 @@ $usageStatsEnabled = $this->getParam('usageStatsEnabled',true);
                     maxlength="36"
                     name="platformId"
                     placeholder="my_flutter_windows_app" />
+                    
+                <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different apps."><i class="icon-question"></i></span></label>
+                <input type="text" class="full-width" name="name" required autocomplete="off" placeholder="My Windows App" maxlength="128" />
 
                 <label for="key">Package Name <span class="tooltip large" data-tooltip="Your application name"><i class="icon-question"></i></span></label>
                 <input type="text" class="full-width" name="key" required autocomplete="off" placeholder="appname" />
diff --git a/app/views/console/keys/index.phtml b/app/views/console/keys/index.phtml
index 3028d206ad..b949d35958 100644
--- a/app/views/console/keys/index.phtml
+++ b/app/views/console/keys/index.phtml
@@ -153,10 +153,7 @@ $scopes = $this->getParam('scopes', []);
                 data-failure-param-alert-classname="error">
 
                 <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
-
-                <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different API keys."><i class="icon-question"></i></span></label>
-                <input type="text" class="full-width" id="name" name="name" required autocomplete="off" maxlength="128" />
-
+                
                 <label for="keyId">Key ID <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different API keys."><i class="icon-question"></i></span></label>
                 <input
                     type="hidden"
@@ -165,6 +162,9 @@ $scopes = $this->getParam('scopes', []);
                     required
                     maxlength="36"
                     name="keyId" />
+                    
+                <label for="name">Name <span class="tooltip large" data-tooltip="Choose any name that will help you distinguish between your different API keys."><i class="icon-question"></i></span></label>
+                <input type="text" class="full-width" id="name" name="name" required autocomplete="off" maxlength="128" />
 
                 <section data-forms-select-all>
                     <label for="scopes">Scopes (<a data-ls-attrs="href={{env.HOME}}/docs/keys" target="_blank" rel="noopener">Learn more</a>)</label>
diff --git a/app/views/console/users/index.phtml b/app/views/console/users/index.phtml
index 6d29c55a63..c8a0689ad7 100644
--- a/app/views/console/users/index.phtml
+++ b/app/views/console/users/index.phtml
@@ -300,7 +300,7 @@ $auth = $this->getParam('auth', []);
                         data-failure-param-alert-text="Failed to create team"
                         data-failure-param-alert-classname="error">
 
-                        <label for="teamId">ID</label>
+                        <label for="teamId">Team ID</label>
                         <input
                             type="hidden"
                             data-custom-id
diff --git a/app/views/console/webhooks/index.phtml b/app/views/console/webhooks/index.phtml
index 7f968aeb11..a7d3e8da84 100644
--- a/app/views/console/webhooks/index.phtml
+++ b/app/views/console/webhooks/index.phtml
@@ -176,10 +176,7 @@ $events = array_keys($this->getParam('events', []));
                 data-failure-param-alert-classname="error">
 
                 <input type="hidden" name="projectId" data-ls-bind="{{router.params.project}}" />
-                <label for="name">Name</label>
-                <input type="text" class="full-width" id="name" name="name" required autocomplete="off" maxlength="128" />
-
-                <label for="webhookId">ID</label>
+                <label for="webhookId">Webhook ID</label>
                 <input
                     type="hidden"
                     data-custom-id
@@ -188,6 +185,9 @@ $events = array_keys($this->getParam('events', []));
                     maxlength="36"
                     id="webhookId"
                     name="webhookId" />
+                    
+                <label for="name">Name</label>
+                <input type="text" class="full-width" id="name" name="name" required autocomplete="off" maxlength="128" />
 
                 <section data-forms-select-all>
                     <label for="events">Events</label>