Minor renaming and move-around refactor to prepare for HCAST/HSD