Tweak command names
Update location of hero names
Fix weird out-of-order prerequisite generation
Clean up includes and ptr/ref declarations