Rename guide stuff.
Bump z-order.