Finish sampler; rename s/p