diff --git a/exercises/floating_ips.sh b/exercises/floating_ips.sh
index b4e1c423e6..ad11a6b793 100755
--- a/exercises/floating_ips.sh
+++ b/exercises/floating_ips.sh
@@ -48,7 +48,7 @@ DEFAULT_IMAGE_NAME=${DEFAULT_IMAGE_NAME:-ami}
 SECGROUP=${SECGROUP:-test_secgroup}
 
 # Default floating IP pool name
-DEFAULT_FLOATING_POOL=${DEFAULT_FLOATING_POOL:-nova}
+DEFAULT_FLOATING_POOL=${DEFAULT_FLOATING_POOL:-public}
 
 # Additional floating IP pool and range
 TEST_FLOATING_POOL=${TEST_FLOATING_POOL:-test}
diff --git a/stackrc b/stackrc
index 5a4c580536..7c4fa68c30 100644
--- a/stackrc
+++ b/stackrc
@@ -217,7 +217,7 @@ S3_SERVICE_PORT=${S3_SERVICE_PORT:-3333}
 
 # Common network names
 PRIVATE_NETWORK_NAME=${PRIVATE_NETWORK_NAME:-"private"}
-PUBLIC_NETWORK_NAME=${PUBLIC_NETWORK_NAME:-"nova"}
+PUBLIC_NETWORK_NAME=${PUBLIC_NETWORK_NAME:-"public"}
 
 # Compatibility until it's eradicated from CI
 USE_SCREEN=${SCREEN_DEV:-$USE_SCREEN}