More renaming, and fiddling with travis