diff --git a/src/sview/grid.c b/src/sview/grid.c
index 05116ac5e807b7b7faef0103a38117cdf48fcf7a..fa4c90e978c330540368d5812b5222bb37de679a 100644
--- a/src/sview/grid.c
+++ b/src/sview/grid.c
@@ -554,7 +554,7 @@ static int *_get_cluster_dims(void)
 {
 	int *my_dim_size = slurmdb_setup_cluster_dim_size();
 
-	if ((cluster_flags & CLUSTER_FLAG_CRAY) && my_dim_size) {
+	if ((cluster_flags & CLUSTER_FLAG_CRAY_A) && my_dim_size) {
 		static int cray_dim_size[3] = {-1, -1, -1};
 		/* For now, assume four nodes per coordinate all in
 		 * the same cage. Need to refine. */
@@ -605,7 +605,7 @@ static int _add_button_to_list(node_info_t *node_ptr,
 				g_error("bad node name %s\n", node_ptr->name);
 				return SLURM_ERROR;
 			}
-			if (cluster_flags & CLUSTER_FLAG_CRAY) {
+			if (cluster_flags & CLUSTER_FLAG_CRAY_A) {
 				len_a = strlen(node_ptr->node_addr);
 				if (len_a < cluster_dims) {
 					g_error("bad node addr %s\n",
@@ -659,7 +659,7 @@ static int _add_button_to_list(node_info_t *node_ptr,
 	} else if (cluster_dims == 3) {
 		int x, y, z;
 		if (node_ptr) {
-			if (cluster_flags & CLUSTER_FLAG_CRAY) {
+			if (cluster_flags & CLUSTER_FLAG_CRAY_A) {
 				x = select_char2coord(
 					node_ptr->node_addr[len_a-3]);
 				y = select_char2coord(