making some progress on the renaming