diff --git a/admin/forms/manufacturer.xml b/admin/forms/manufacturer.xml
index e2ff4ad..95d6110 100644
--- a/admin/forms/manufacturer.xml
+++ b/admin/forms/manufacturer.xml
@@ -9,16 +9,16 @@
 		<field
 			name="name_short"
 			type="text"
-			label="COM_DEPOT_FIELD_COMPONENT_NAME_LABEL"
-			description="COM_DEPOT_FIELD_COMPONENT_NAME_DESC"
+			label="COM_DEPOT_FIELD_MANUFACTURER_ACRONYM_LABEL"
+			description="COM_DEPOT_FIELD_MANUFACTURER_ACRONYM_DESC"
 			required="true"
 			autofocus="1"
 		/>
 		<field
 			name="name_long"
 			type="text"
-			label="COM_DEPOT_FIELD_COMPONENT_NAME_LABEL"
-			description="COM_DEPOT_FIELD_COMPONENT_NAME_DESC"
+			label="COM_DEPOT_FIELD_MANUFACTURER_LONG_NAME_LABEL"
+			description="COM_DEPOT_FIELD_MANUFACTURER_LONG_NAME_DESC"
 			required="true"
 		/>
 		<field
@@ -26,7 +26,7 @@
 			type="text"
 			label="JFIELD_ALIAS_LABEL"
 			description="JFIELD_ALIAS_DESC"
-			hint="COM_DEPOT_FIELD_ALIAS_PLACEHOLDER"
+			hint="COM_DEPOT_FIELD_ALIAS_MANUFACTURER_PLACEHOLDER"
 			size="40"
 		/>
 		<field
diff --git a/admin/forms/part.xml b/admin/forms/part.xml
index 7e3daeb..b400dc0 100644
--- a/admin/forms/part.xml
+++ b/admin/forms/part.xml
@@ -33,7 +33,7 @@
 			type="text"
 			label="JFIELD_ALIAS_LABEL"
 			description="JFIELD_ALIAS_DESC"
-			hint="COM_DEPOT_FIELD_ALIAS_PLACEHOLDER"
+			hint="COM_DEPOT_FIELD_ALIAS_PART_PLACEHOLDER"
 			size="40"
 		/>
 		<field
diff --git a/admin/forms/stock.xml b/admin/forms/stock.xml
index 0dda35e..c01b293 100644
--- a/admin/forms/stock.xml
+++ b/admin/forms/stock.xml
@@ -9,16 +9,16 @@
 		<field
 			name="name"
 			type="text"
-			label="COM_DEPOT_FIELD_COMPONENT_NAME_LABEL"
-			description="COM_DEPOT_FIELD_COMPONENT_NAME_DESC"
+			label="COM_DEPOT_FIELD_STOCK_NAME_LABEL"
+			description="COM_DEPOT_FIELD_STOCK_NAME_DESC"
 			required="true"
 			autofocus="1"
 		/>
 		<field
 			name="description"
 			type="text"
-			label="COM_DEPOT_FIELD_COMPONENT_NAME_LABEL"
-			description="COM_DEPOT_FIELD_COMPONENT_NAME_DESC"
+			label="COM_DEPOT_FIELD_STOCK_DESCRIPTION_LABEL"
+			description="COM_DEPOT_FIELD_STOCK_DESCRIPTION_DESC"
 			required="true"
 		/>
 		<field
@@ -26,7 +26,7 @@
 			type="text"
 			label="JFIELD_ALIAS_LABEL"
 			description="JFIELD_ALIAS_DESC"
-			hint="COM_DEPOT_FIELD_ALIAS_PLACEHOLDER"
+			hint="COM_DEPOT_FIELD_ALIAS_STOCK_PLACEHOLDER"
 			size="40"
 		/>
 		<field
diff --git a/admin/language/en-GB/com_depot.ini b/admin/language/en-GB/com_depot.ini
index c160278..fa8a1d6 100644
--- a/admin/language/en-GB/com_depot.ini
+++ b/admin/language/en-GB/com_depot.ini
@@ -5,11 +5,17 @@
 ; @license		GNU General Public License version 2 or later; see LICENSE.md
 ; @since		0.0.1
 ;
-COM_DEPOT_FIELD_ALIAS_PLACEHOLDER="Auto-generate from component name"
+COM_DEPOT_FIELD_ALIAS_PART_PLACEHOLDER="Auto-generate from component name"
+COM_DEPOT_FIELD_ALIAS_STOCK_PLACEHOLDER="Auto-generate from stock name"
+COM_DEPOT_FIELD_ALIAS_MANUFACTURER_PLACEHOLDER="Auto-generate from manufacturer acronym"
 COM_DEPOT_FIELD_COMPONENT_NAME_DESC="The name of the component is unique. Please do not enter special characters or umlauts."
 COM_DEPOT_FIELD_COMPONENT_NAME_LABEL="Component Name"
 COM_DEPOT_FIELD_CREATED_LABEL="Created"
 COM_DEPOT_FIELD_CREATED_BY_LABEL="Created by"
+COM_DEPOT_FIELD_MANUFACTURER_ACRONYM_DESC="Enter here the acronym of the manufacturer or short name"
+COM_DEPOT_FIELD_MANUFACTURER_ACRONYM_LABEL="Manufacturer Acronym"
+COM_DEPOT_FIELD_MANUFACTURER_LONG_NAME_DESC="Enter here the long name of the manufacturer"
+COM_DEPOT_FIELD_MANUFACTURER_LONG_NAME_LABEL="Manufacturer (long name)"
 COM_DEPOT_FIELD_MODIFIED_LABEL="Modified"
 COM_DEPOT_FIELD_MODIFIED_BY_LABEL="Modified by"
 COM_DEPOT_FIELD_QUANTITY_LABEL="Quantity"
@@ -18,6 +24,10 @@ COM_DEPOT_FIELD_QUANTITY_EXP_LABEL="Quantity Exponent"
 COM_DEPOT_FIELD_QUANTITY_EXP_DESC="Exponent (10^x of the number, usually 0, i.e. 10⁰)"
 COM_DEPOT_FIELD_SELECT_MANUFACTURER="Manufacturer"
 COM_DEPOT_FIELD_SELECT_STOCK="Stock Location"
+COM_DEPOT_FIELD_STOCK_NAME_DESC="Enter here the short stock location"
+COM_DEPOT_FIELD_STOCK_NAME_LABEL="Stock Location"
+COM_DEPOT_FIELD_STOCK_DESCRIPTION_DESC="Enter here the exact location/description"
+COM_DEPOT_FIELD_STOCK_DESCRIPTION_LABEL="Description"
 COM_DEPOT_LEGEND_MANUFACTURER_DETAILS="Manufacturer Details"
 COM_DEPOT_LEGEND_PART_DETAILS="Component Details"
 COM_DEPOT_LEGEND_STOCK_DETAILS="Stock Location Details"
@@ -36,6 +46,7 @@ COM_DEPOT_TAB_NEW_PART="New Component"
 COM_DEPOT_TAB_NEW_MANUFACTURER="New Manufacturer"
 COM_DEPOT_TAB_EDIT_PART="Component Details"
 COM_DEPOT_TAB_EDIT_MANUFACTURER="Manufacturer Details"
+COM_DEPOT_TAB_EDIT_STOCK="Stock Details"
 COM_DEPOT_TAB_STATISTICS="Statistics"
 COM_DEPOT_TABLE_HEAD_ID="ID"
 COM_DEPOT_TABLE_HEAD_NAME="Component Name"