Finishing up renames