A few renames and test changes.