More renaming and testing.