Change sample to consist naming changes.