Revert "Minor naming change for samples"

This reverts commit b7f1f52c2029f4e6a990184ffdd335e701e60b60.