Rename some vars in hs bin