Add CleanCommand, rename commands