Requirement rename on Rule and Cluster

Due to bug race condition on require method call