Add continuous progress and bunch of renaming.