diff --git a/cinder-controller/Dockerfile b/cinder_controller/Dockerfile
similarity index 100%
rename from cinder-controller/Dockerfile
rename to cinder_controller/Dockerfile
diff --git a/cinder-controller/README.md b/cinder_controller/README.md
similarity index 100%
rename from cinder-controller/README.md
rename to cinder_controller/README.md
diff --git a/cinder-controller/admin-openrc.sh b/cinder_controller/admin-openrc.sh
similarity index 100%
rename from cinder-controller/admin-openrc.sh
rename to cinder_controller/admin-openrc.sh
diff --git a/cinder-controller/bootstrap.sh b/cinder_controller/bootstrap.sh
similarity index 100%
rename from cinder-controller/bootstrap.sh
rename to cinder_controller/bootstrap.sh
diff --git a/cinder-controller/run.sh b/cinder_controller/run.sh
similarity index 100%
rename from cinder-controller/run.sh
rename to cinder_controller/run.sh
diff --git a/cinder-controller/write_conf.sh b/cinder_controller/write_conf.sh
similarity index 100%
rename from cinder-controller/write_conf.sh
rename to cinder_controller/write_conf.sh
diff --git a/cinder-storage/Dockerfile b/cinder_storage/Dockerfile
similarity index 100%
rename from cinder-storage/Dockerfile
rename to cinder_storage/Dockerfile
diff --git a/cinder-storage/README.md b/cinder_storage/README.md
similarity index 100%
rename from cinder-storage/README.md
rename to cinder_storage/README.md
diff --git a/cinder-storage/admin-openrc.sh b/cinder_storage/admin-openrc.sh
similarity index 100%
rename from cinder-storage/admin-openrc.sh
rename to cinder_storage/admin-openrc.sh
diff --git a/cinder-storage/bootstrap.sh b/cinder_storage/bootstrap.sh
similarity index 100%
rename from cinder-storage/bootstrap.sh
rename to cinder_storage/bootstrap.sh
diff --git a/cinder-storage/lvm.conf b/cinder_storage/lvm.conf
similarity index 100%
rename from cinder-storage/lvm.conf
rename to cinder_storage/lvm.conf
diff --git a/cinder-storage/run.sh b/cinder_storage/run.sh
similarity index 100%
rename from cinder-storage/run.sh
rename to cinder_storage/run.sh
diff --git a/cinder-storage/write_conf.sh b/cinder_storage/write_conf.sh
similarity index 100%
rename from cinder-storage/write_conf.sh
rename to cinder_storage/write_conf.sh
diff --git a/neutron-controller/Dockerfile b/neutron_controller/Dockerfile
similarity index 100%
rename from neutron-controller/Dockerfile
rename to neutron_controller/Dockerfile
diff --git a/neutron-controller/README.md b/neutron_controller/README.md
similarity index 100%
rename from neutron-controller/README.md
rename to neutron_controller/README.md
diff --git a/neutron-controller/bootstrap.sh b/neutron_controller/bootstrap.sh
similarity index 100%
rename from neutron-controller/bootstrap.sh
rename to neutron_controller/bootstrap.sh
diff --git a/neutron-controller/db_base_plugin_v2.py b/neutron_controller/db_base_plugin_v2.py
similarity index 100%
rename from neutron-controller/db_base_plugin_v2.py
rename to neutron_controller/db_base_plugin_v2.py
diff --git a/neutron-controller/run.sh b/neutron_controller/run.sh
similarity index 100%
rename from neutron-controller/run.sh
rename to neutron_controller/run.sh
diff --git a/neutron-controller/write_conf.sh b/neutron_controller/write_conf.sh
similarity index 100%
rename from neutron-controller/write_conf.sh
rename to neutron_controller/write_conf.sh
diff --git a/nova-compute/Dockerfile b/nova_compute/Dockerfile
similarity index 100%
rename from nova-compute/Dockerfile
rename to nova_compute/Dockerfile
diff --git a/nova-compute/README.md b/nova_compute/README.md
similarity index 100%
rename from nova-compute/README.md
rename to nova_compute/README.md
diff --git a/nova-compute/run.sh b/nova_compute/run.sh
similarity index 100%
rename from nova-compute/run.sh
rename to nova_compute/run.sh
diff --git a/nova-compute/write_conf.sh b/nova_compute/write_conf.sh
similarity index 100%
rename from nova-compute/write_conf.sh
rename to nova_compute/write_conf.sh
diff --git a/nova-service/Dockerfile b/nova_service/Dockerfile
similarity index 100%
rename from nova-service/Dockerfile
rename to nova_service/Dockerfile
diff --git a/nova-service/README.md b/nova_service/README.md
similarity index 100%
rename from nova-service/README.md
rename to nova_service/README.md
diff --git a/nova-service/bootstrap.sh b/nova_service/bootstrap.sh
similarity index 100%
rename from nova-service/bootstrap.sh
rename to nova_service/bootstrap.sh
diff --git a/nova-service/run.sh b/nova_service/run.sh
similarity index 100%
rename from nova-service/run.sh
rename to nova_service/run.sh
diff --git a/nova-service/write_conf.sh b/nova_service/write_conf.sh
similarity index 100%
rename from nova-service/write_conf.sh
rename to nova_service/write_conf.sh
diff --git a/openstack-client/Dockerfile b/openstack_client/Dockerfile
similarity index 100%
rename from openstack-client/Dockerfile
rename to openstack_client/Dockerfile
diff --git a/openstack-client/README.md b/openstack_client/README.md
similarity index 100%
rename from openstack-client/README.md
rename to openstack_client/README.md
diff --git a/openstack-client/bootstrap.sh b/openstack_client/bootstrap.sh
similarity index 100%
rename from openstack-client/bootstrap.sh
rename to openstack_client/bootstrap.sh
diff --git a/openstack-client/demo-openrc.sh b/openstack_client/demo-openrc.sh
similarity index 100%
rename from openstack-client/demo-openrc.sh
rename to openstack_client/demo-openrc.sh