more renames + tests