Refactor stmt names, sample.