Rename to foo-so# some more.