Prepare to export macros from state Exploring

---

Rename