a few simple renames