Change 2005-3-sbs to the more explicit 2005-3-sbs-full

also change 2005-3-sbs-all to simply 2005-3-sbs
drop 2005-3-all because we don't need it