diff --git a/bin/gen-authors.sh b/bin/gen-authors.sh
index b7fd235a3..716253791 100755
--- a/bin/gen-authors.sh
+++ b/bin/gen-authors.sh
@@ -844,7 +844,7 @@ EOF
 	    #
 	    echo "<p><a name=\"$AUTHOR_HANDLE\"></a>**$FULL_NAME**</br>"
 	    echo "author_handle: $AUTHOR_HANDLE</br>"
-	    if [[ $LOCATION_NAME == $LOCATION_COMMON_NAME ]]; then
+	    if [[ $LOCATION_NAME == "$LOCATION_COMMON_NAME" ]]; then
 		echo "Location: [$LOCATION_CODE](location.html#$LOCATION_CODE) -" \
 		     "_${LOCATION_NAME}_</p>"
 	    else
diff --git a/bin/gen-location.sh b/bin/gen-location.sh
index d90c9ccd2..8f6d4e645 100755
--- a/bin/gen-location.sh
+++ b/bin/gen-location.sh
@@ -457,7 +457,7 @@ fi
 
 	# output markdown entry for this location
 	#
-	if [[ $LOCATION_NAME == $LOCATION_COMMON_NAME ]]; then
+	if [[ $LOCATION_NAME == "$LOCATION_COMMON_NAME" ]]; then
 	    echo "* <a name=$LOCATION_CODE></a>**$LOCATION_CODE** - _${LOCATION_NAME}_"
 	else
 	    echo "* <a name=$LOCATION_CODE></a>**$LOCATION_CODE** - _${LOCATION_NAME}_ (_${LOCATION_COMMON_NAME}_)"
diff --git a/bin/output-index-author.sh b/bin/output-index-author.sh
index 84762129c..145ad5be3 100755
--- a/bin/output-index-author.sh
+++ b/bin/output-index-author.sh
@@ -786,7 +786,7 @@ for author_handle in $AUTHOR_HANDLE_SET; do
 	if [[ $LOCATION_CODE == null ]]; then
 	    echo "Location: [unknown](${DOCROOT_SLASH}location.html#$LOCATION_CODE) - _${LOCATION_NAME}_"
 	else
-	    if [[ $LOCATION_NAME == $LOCATION_COMMON_NAME ]]; then
+	    if [[ $LOCATION_NAME == "$LOCATION_COMMON_NAME" ]]; then
 		echo "Location: [$LOCATION_CODE](${DOCROOT_SLASH}location.html#$LOCATION_CODE) -" \
 		     "_${LOCATION_NAME}_"
 	    else