Rename Hydrant -> Avalon