diff --git a/hot/heat_keystone/keystone.yaml b/hot/keystone/keystone.yaml
similarity index 100%
rename from hot/heat_keystone/keystone.yaml
rename to hot/keystone/keystone.yaml
diff --git a/hot/heat_keystone/keystone_group.yaml b/hot/keystone/keystone_group.yaml
similarity index 100%
rename from hot/heat_keystone/keystone_group.yaml
rename to hot/keystone/keystone_group.yaml
diff --git a/hot/heat_keystone/keystone_project.yaml b/hot/keystone/keystone_project.yaml
similarity index 100%
rename from hot/heat_keystone/keystone_project.yaml
rename to hot/keystone/keystone_project.yaml
diff --git a/hot/heat_keystone/keystone_role.yaml b/hot/keystone/keystone_role.yaml
similarity index 100%
rename from hot/heat_keystone/keystone_role.yaml
rename to hot/keystone/keystone_role.yaml
diff --git a/hot/heat_keystone/keystone_service.yaml b/hot/keystone/keystone_service.yaml
similarity index 100%
rename from hot/heat_keystone/keystone_service.yaml
rename to hot/keystone/keystone_service.yaml
diff --git a/hot/heat_keystone/keystone_service_endpoint.yaml b/hot/keystone/keystone_service_endpoint.yaml
similarity index 100%
rename from hot/heat_keystone/keystone_service_endpoint.yaml
rename to hot/keystone/keystone_service_endpoint.yaml
diff --git a/hot/heat_keystone/keystone_updated.yaml b/hot/keystone/keystone_updated.yaml
similarity index 100%
rename from hot/heat_keystone/keystone_updated.yaml
rename to hot/keystone/keystone_updated.yaml
diff --git a/hot/heat_keystone/keystone_user.yaml b/hot/keystone/keystone_user.yaml
similarity index 100%
rename from hot/heat_keystone/keystone_user.yaml
rename to hot/keystone/keystone_user.yaml