More renames and tests