* hc to satellite rename * rebase with master and fix spelling * missed out rename * rebase merge fix