[cleanup] finishing renames