hayt-* naming update