Naming consistency in sampler