Minor Site/Target rename fixes.