diff --git a/sormas-app/app/src/main/java/de/symeda/sormas/app/environment/edit/EnvironmentNewFragment.java b/sormas-app/app/src/main/java/de/symeda/sormas/app/environment/edit/EnvironmentNewFragment.java
index 1f0e34282e4..c573e547317 100644
--- a/sormas-app/app/src/main/java/de/symeda/sormas/app/environment/edit/EnvironmentNewFragment.java
+++ b/sormas-app/app/src/main/java/de/symeda/sormas/app/environment/edit/EnvironmentNewFragment.java
@@ -67,7 +67,7 @@ protected void onLayoutBinding(FragmentEnvironmentNewLayoutBinding contentBindin
 		setUpControlListeners(contentBinding);
 		contentBinding.setData(record);
 
-		EnvironmentValidator.initializeLocationValidations(contentBinding.environmentEnvironmentLocation, () -> record.getLocation());
+		EnvironmentValidator.initializeLocationValidations(contentBinding.environmentLocation, () -> record.getLocation());
 
 		contentBinding.environmentEnvironmentMedia.initializeSpinner(environmentMediaList);
 
@@ -77,7 +77,7 @@ protected void onLayoutBinding(FragmentEnvironmentNewLayoutBinding contentBindin
 	}
 
 	private void setUpControlListeners(final FragmentEnvironmentNewLayoutBinding contentBinding) {
-		contentBinding.environmentEnvironmentLocation.setOnClickListener(new View.OnClickListener() {
+		contentBinding.environmentLocation.setOnClickListener(new View.OnClickListener() {
 
 			@Override
 			public void onClick(View v) {
@@ -100,7 +100,7 @@ private void openAddressPopup(final FragmentEnvironmentNewLayoutBinding contentB
 		locationDialog.setPositiveCallback(() -> {
 			try {
 				FragmentValidator.validate(getContext(), locationDialog.getContentBinding());
-				contentBinding.environmentEnvironmentLocation.setValue(locationClone);
+				contentBinding.environmentLocation.setValue(locationClone);
 				record.setLocation(locationClone);
 				contentBinding.environmentResponsibleUser.initializeSpinner(updateResponsibleUserList(record.getLocation().getDistrict()));
 
diff --git a/sormas-app/app/src/main/res/layout/fragment_environment_new_layout.xml b/sormas-app/app/src/main/res/layout/fragment_environment_new_layout.xml
index 99035ee8734..f41dffb966e 100644
--- a/sormas-app/app/src/main/res/layout/fragment_environment_new_layout.xml
+++ b/sormas-app/app/src/main/res/layout/fragment_environment_new_layout.xml
@@ -72,7 +72,7 @@
                 app:value="@={data.environmentName}" />
 
             <de.symeda.sormas.app.component.controls.ControlTextPopupField
-                android:id="@+id/environment_environmentLocation"
+                android:id="@+id/environment_location"
                 style="@style/ControlSingleColumnStyle"
                 app:hint="@string/hint_enter_location"
                 app:iconStart="@drawable/ic_edit_location_black_24dp"