Cleanup of Zephyr tree block names.