diff --git a/README.md b/README.md
index 8caf733..32c7c19 100644
--- a/README.md
+++ b/README.md
@@ -46,11 +46,11 @@ No resources.
 | Name | Description |
 |------|-------------|
 | location | Map of information for the location. Return 'none' if location is not found. |
-| location_name | Standard name of the location. Return 'none' if location is not found. |
-| location_display_name | Display name of the location. Return 'none' if location is not found. |
-| location_short_name | Short name of the location. Return 'none' if location is not found and null if there is no short name for this location. |
-| location_regional_display_name | Regional display name of the location. Return 'none' if location is not found. |
-| location_paired_region_name | Paired region name of the location. Return 'none' if location is not found and null if there is no paired region name for this location.  |
+| name | Standard name of the location. Return 'none' if location is not found. |
+| display_name | Display name of the location. Return 'none' if location is not found. |
+| short_name | Short name of the location. Return 'none' if location is not found and null if there is no short name for this location. |
+| regional_display_name | Regional display name of the location. Return 'none' if location is not found. |
+| paired_region_name | Paired region name of the location. Return 'none' if location is not found and null if there is no paired region name for this location.  |
 
 
 ## Related documentation
diff --git a/outputs.tf b/outputs.tf
index aff287a..ab327de 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -3,27 +3,27 @@ output "location" {
   value       = local.location
 }
 
-output "location_name" {
+output "name" {
   description = "Standard name of the location. Return 'none' if location is not found."
   value       = try(local.location.name, "none")
 }
 
-output "location_display_name" {
+output "display_name" {
   description = "Display name of the location. Return 'none' if location is not found."
   value       = try(local.location.display_name, "none")
 }
 
-output "location_short_name" {
+output "short_name" {
   description = "Short name of the location. Return 'none' if location is not found and null if there is no short name for this location."
   value       = try(local.location.short_name, "none")
 }
 
-output "location_regional_display_name" {
+output "regional_display_name" {
   description = "Regional display name of the location. Return 'none' if location is not found."
   value       = try(local.location.regional_display_name, "none")
 }
 
-output "location_paired_region_name" {
+output "paired_region_name" {
   description = "Paired region name of the location. Return 'none' if location is not found and null if there is no paired region name for this location."
   value       = try(local.location.paired_region_name, "none")
 }
\ No newline at end of file