diff --git a/src/ovsdb-cluster/interface.yaml b/src/ovsdb_cluster/interface.yaml
similarity index 100%
rename from src/ovsdb-cluster/interface.yaml
rename to src/ovsdb_cluster/interface.yaml
diff --git a/src/ovsdb-cluster/lib b/src/ovsdb_cluster/lib
similarity index 100%
rename from src/ovsdb-cluster/lib
rename to src/ovsdb_cluster/lib
diff --git a/src/ovsdb-cluster/peers.py b/src/ovsdb_cluster/peers.py
similarity index 88%
rename from src/ovsdb-cluster/peers.py
rename to src/ovsdb_cluster/peers.py
index 3e056d9..3e95480 100644
--- a/src/ovsdb-cluster/peers.py
+++ b/src/ovsdb_cluster/peers.py
@@ -44,19 +44,16 @@ class OVSDBClusterPeer(ovsdb.OVSDB):
             for relation in self.relations:
                 for unit in relation.units:
                     if not unit.received.get('bound-address'):
-                        break
-                else:
-                    continue
-                break
-            else:
-                return True
+                        return False
+            return True
         return False
 
     @when('endpoint.{endpoint_name}.joined')
     def joined(self):
         super().joined()
-        self.publish_cluster_local_addr()
-        if self.expected_peers_available:
+        if reactive.is_flag_set('leadership.set.ready'):
+            self.publish_cluster_local_addr()
+        if self.expected_peers_available():
             reactive.set_flag(self.expand_name('{endpoint_name}.available'))
 
     @when('endpoint.{endpoint_name}.broken')
diff --git a/src/ovsdb-cluster/provides.py b/src/ovsdb_cluster/provides.py
similarity index 100%
rename from src/ovsdb-cluster/provides.py
rename to src/ovsdb_cluster/provides.py
diff --git a/src/ovsdb-cluster/requires.py b/src/ovsdb_cluster/requires.py
similarity index 100%
rename from src/ovsdb-cluster/requires.py
rename to src/ovsdb_cluster/requires.py
diff --git a/src/ovsdb-cms/interface.yaml b/src/ovsdb_cms/interface.yaml
similarity index 100%
rename from src/ovsdb-cms/interface.yaml
rename to src/ovsdb_cms/interface.yaml
diff --git a/src/ovsdb-cms/lib b/src/ovsdb_cms/lib
similarity index 100%
rename from src/ovsdb-cms/lib
rename to src/ovsdb_cms/lib
diff --git a/src/ovsdb-cms/provides.py b/src/ovsdb_cms/provides.py
similarity index 100%
rename from src/ovsdb-cms/provides.py
rename to src/ovsdb_cms/provides.py
diff --git a/src/ovsdb-cms/requires.py b/src/ovsdb_cms/requires.py
similarity index 100%
rename from src/ovsdb-cms/requires.py
rename to src/ovsdb_cms/requires.py