From: Ben Pfaff <blp@cs.stanford.edu>
Date: Wed, 23 Nov 2022 02:47:59 +0000 (-0800)
Subject: examples: Rename variables for nhtsa example to give them better names.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2f3f4d9b20e0cde593fad4137cdc48922a38c3da;p=pspp

examples: Rename variables for nhtsa example to give them better names.

The existing names were taken from question numbers in the questionnaire
(I guess), which weren't meaningful.  This replaces them by meaningful
names.

Thanks to Frans Houweling <fhouweling@email.it> for providing the new
names!
---

diff --git a/doc/pspp-figures/ctables1.sps b/doc/pspp-figures/ctables1.sps
index ca6431a837..f2cf21afaf 100644
--- a/doc/pspp-figures/ctables1.sps
+++ b/doc/pspp-figures/ctables1.sps
@@ -1,2 +1,2 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE=AgeGroup.
+CTABLES /TABLE=ageGroup.
diff --git a/doc/pspp-figures/ctables10.sps b/doc/pspp-figures/ctables10.sps
index 8adb5ff336..90975536e1 100644
--- a/doc/pspp-figures/ctables10.sps
+++ b/doc/pspp-figures/ctables10.sps
@@ -1,4 +1,4 @@
 GET FILE='nhtsa.sav'.
 CTABLES
-    /TABLE=qnd1 [MEAN, MEDIAN] BY qns3a
-    /TABLE=AgeGroup [COLPCT, ROWPCT] BY qns3a.
+    /TABLE=age [MEAN, MEDIAN] BY gender
+    /TABLE=ageGroup [COLPCT, ROWPCT] BY gender.
diff --git a/doc/pspp-figures/ctables11.sps b/doc/pspp-figures/ctables11.sps
index d2e064c4cb..8553f69ece 100644
--- a/doc/pspp-figures/ctables11.sps
+++ b/doc/pspp-figures/ctables11.sps
@@ -1,4 +1,4 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE=AgeGroup [COLPCT 'Gender %' PCT5.0,
+CTABLES /TABLE=ageGroup [COLPCT 'Gender %' PCT5.0,
                          ROWPCT 'Age Group %' PCT5.0]
-               BY qns3a.
+               BY gender.
diff --git a/doc/pspp-figures/ctables12.sps b/doc/pspp-figures/ctables12.sps
index 0ec07bb344..b43f3ba463 100644
--- a/doc/pspp-figures/ctables12.sps
+++ b/doc/pspp-figures/ctables12.sps
@@ -1,2 +1,2 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE=(AgeGroup + qns1)[COLPCT] BY qns3a.
+CTABLES /TABLE=(ageGroup + membersOver16)[COLPCT] BY gender.
diff --git a/doc/pspp-figures/ctables13.sps b/doc/pspp-figures/ctables13.sps
index 723dbeda31..5dbc26f5e8 100644
--- a/doc/pspp-figures/ctables13.sps
+++ b/doc/pspp-figures/ctables13.sps
@@ -1,2 +1,2 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE=qnd1 [MEAN, MEDIAN] BY qns3a.
+CTABLES /TABLE=age [MEAN, MEDIAN] BY gender.
diff --git a/doc/pspp-figures/ctables14.sps b/doc/pspp-figures/ctables14.sps
index 168d237f17..b1e30c2459 100644
--- a/doc/pspp-figures/ctables14.sps
+++ b/doc/pspp-figures/ctables14.sps
@@ -1,2 +1,2 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE=qnd1 [MEAN, MEDIAN] BY qns3a /SLABELS POSITION=ROW.
+CTABLES /TABLE=age [MEAN, MEDIAN] BY gender /SLABELS POSITION=ROW.
diff --git a/doc/pspp-figures/ctables15.sps b/doc/pspp-figures/ctables15.sps
index c8b86f7162..1cf0a679f2 100644
--- a/doc/pspp-figures/ctables15.sps
+++ b/doc/pspp-figures/ctables15.sps
@@ -1,2 +1,2 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE=AgeGroup [TABLEPCT] /SLABELS VISIBLE=NO.
+CTABLES /TABLE=ageGroup [TABLEPCT] /SLABELS VISIBLE=NO.
diff --git a/doc/pspp-figures/ctables16.sps b/doc/pspp-figures/ctables16.sps
index 5812acef97..9c32a9e401 100644
--- a/doc/pspp-figures/ctables16.sps
+++ b/doc/pspp-figures/ctables16.sps
@@ -1,2 +1,2 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE AgeGroup BY qns3a.
+CTABLES /TABLE ageGroup BY gender.
diff --git a/doc/pspp-figures/ctables17.sps b/doc/pspp-figures/ctables17.sps
index ffeabf56b9..787b5c969e 100644
--- a/doc/pspp-figures/ctables17.sps
+++ b/doc/pspp-figures/ctables17.sps
@@ -1,3 +1,3 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE AgeGroup BY qns3a /CLABELS ROWLABELS=OPPOSITE.
-CTABLES /TABLE AgeGroup BY qns3a /CLABELS COLLABELS=OPPOSITE.
+CTABLES /TABLE ageGroup BY gender /CLABELS ROWLABELS=OPPOSITE.
+CTABLES /TABLE ageGroup BY gender /CLABELS COLLABELS=OPPOSITE.
diff --git a/doc/pspp-figures/ctables2.sps b/doc/pspp-figures/ctables2.sps
index bc4dbbe80d..cf35bd9de8 100644
--- a/doc/pspp-figures/ctables2.sps
+++ b/doc/pspp-figures/ctables2.sps
@@ -1,2 +1,2 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE=AgeGroup BY qns3a.
+CTABLES /TABLE=ageGroup BY gender.
diff --git a/doc/pspp-figures/ctables22.sps b/doc/pspp-figures/ctables22.sps
index 205814c3d7..48dd3a79f3 100644
--- a/doc/pspp-figures/ctables22.sps
+++ b/doc/pspp-figures/ctables22.sps
@@ -1,5 +1,12 @@
 GET FILE='nhtsa.sav'.
+VARIABLE LABELS
+   hasBeenPassengerOfDesignatedDriver 'desPas'
+   hasBeenPassengerOfDrunkDriver 'druPas'
+   isLicensedDriver 'licensed'
+   hasHostedEventWithAlcohol 'hostAlc'
+   hasBeenDesignatedDriver 'desDrv'.
 CTABLES
-    /VLABELS VARIABLES=ALL DISPLAY=NAME
-    /TABLE qn61 > qn57 BY qnd7a > qn86 + qn64b BY qns3a[TABLEID, LAYERID, SUBTABLEID]
+    /TABLE hasBeenPassengerOfDesignatedDriver > hasBeenPassengerOfDrunkDriver
+        BY isLicensedDriver > hasHostedEventWithAlcohol + hasBeenDesignatedDriver
+	BY gender[TABLEID, LAYERID, SUBTABLEID]
     /SLABELS POSITION=ROW.
diff --git a/doc/pspp-figures/ctables23.sps b/doc/pspp-figures/ctables23.sps
index df37390d46..c509a5492c 100644
--- a/doc/pspp-figures/ctables23.sps
+++ b/doc/pspp-figures/ctables23.sps
@@ -1,2 +1,2 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE AgeGroup BY qns3a [ROWPCT, COLPCT].
+CTABLES /TABLE ageGroup BY gender [ROWPCT, COLPCT].
diff --git a/doc/pspp-figures/ctables24.sps b/doc/pspp-figures/ctables24.sps
index 7a12c08037..6b277f81bc 100644
--- a/doc/pspp-figures/ctables24.sps
+++ b/doc/pspp-figures/ctables24.sps
@@ -1,4 +1,4 @@
 GET FILE='nhtsa.sav'.
 CTABLES
-    /TABLE AgeGroup BY qns3a [ROWPCT, COLPCT]
+    /TABLE ageGroup BY gender [ROWPCT, COLPCT]
     /CLABELS COLLABELS=OPPOSITE.
diff --git a/doc/pspp-figures/ctables25.sps b/doc/pspp-figures/ctables25.sps
index f52da99f06..888dca744a 100644
--- a/doc/pspp-figures/ctables25.sps
+++ b/doc/pspp-figures/ctables25.sps
@@ -1,4 +1,4 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE (qn105ba + qn105bb) [COLPCT].
-CTABLES /TABLE (qn105ba + qn105bb) [ROWPCT]
+CTABLES /TABLE (likelihoodOfBeingStoppedByPolice + likelihoodOfHavingAnAccident) [COLPCT].
+CTABLES /TABLE (likelihoodOfBeingStoppedByPolice + likelihoodOfHavingAnAccident) [ROWPCT]
   /CLABELS ROW=OPPOSITE.
diff --git a/doc/pspp-figures/ctables26.sps b/doc/pspp-figures/ctables26.sps
index 270dfe65ca..84953b502f 100644
--- a/doc/pspp-figures/ctables26.sps
+++ b/doc/pspp-figures/ctables26.sps
@@ -1,4 +1,4 @@
 GET FILE='nhtsa.sav'.
 CTABLES
-    /TABLE qnd7a [COUNT, TOTALS[COUNT, VALIDN]]
-    /CATEGORIES VARIABLES=qnd7a TOTAL=YES MISSING=INCLUDE.
+    /TABLE isLicensedDriver [COUNT, TOTALS[COUNT, VALIDN]]
+    /CATEGORIES VARIABLES=isLicensedDriver TOTAL=YES MISSING=INCLUDE.
diff --git a/doc/pspp-figures/ctables27.sps b/doc/pspp-figures/ctables27.sps
index bc613c0e37..79cd07e18d 100644
--- a/doc/pspp-figures/ctables27.sps
+++ b/doc/pspp-figures/ctables27.sps
@@ -1,3 +1,3 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE qn1.
-CTABLES /TABLE qn1 /CATEGORIES VARIABLES=qn1 [1, 2, 3].
+CTABLES /TABLE freqOfDriving.
+CTABLES /TABLE freqOfDriving /CATEGORIES VARIABLES=freqOfDriving [1, 2, 3].
diff --git a/doc/pspp-figures/ctables28.sps b/doc/pspp-figures/ctables28.sps
index dd8ffb4deb..05e85a46e6 100644
--- a/doc/pspp-figures/ctables28.sps
+++ b/doc/pspp-figures/ctables28.sps
@@ -1,3 +1,3 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE qn1.
-CTABLES /TABLE qn1 /CATEGORIES VARIABLES=qn1 MISSING=INCLUDE.
+CTABLES /TABLE freqOfDriving.
+CTABLES /TABLE freqOfDriving /CATEGORIES VARIABLES=freqOfDriving MISSING=INCLUDE.
diff --git a/doc/pspp-figures/ctables29.sps b/doc/pspp-figures/ctables29.sps
index 944ab1e5db..392ec6c7c1 100644
--- a/doc/pspp-figures/ctables29.sps
+++ b/doc/pspp-figures/ctables29.sps
@@ -1,6 +1,6 @@
 GET FILE='nhtsa.sav'.
 CTABLES
-    /TABLE qn1
-    /CATEGORIES VARIABLES=qn1 [OTHERNM, SUBTOTAL='Valid Total',
-                               MISSING, SUBTOTAL='Missing Total']
-			      TOTAL=YES LABEL='Overall Total'.
+    /TABLE freqOfDriving
+    /CATEGORIES VARIABLES=freqOfDriving [OTHERNM, SUBTOTAL='Valid Total',
+					 MISSING, SUBTOTAL='Missing Total']
+                                        TOTAL=YES LABEL='Overall Total'.
diff --git a/doc/pspp-figures/ctables3.sps b/doc/pspp-figures/ctables3.sps
index 4736cce247..1b2f38952e 100644
--- a/doc/pspp-figures/ctables3.sps
+++ b/doc/pspp-figures/ctables3.sps
@@ -1,2 +1,2 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE AgeGroup > qns3a BY qn86.
+CTABLES /TABLE ageGroup > gender BY hasHostedEventWithAlcohol.
diff --git a/doc/pspp-figures/ctables30.sps b/doc/pspp-figures/ctables30.sps
index 569e4aed50..da4132eb63 100644
--- a/doc/pspp-figures/ctables30.sps
+++ b/doc/pspp-figures/ctables30.sps
@@ -1,3 +1,3 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE=qn20 [MEAN F8.1, COUNT, VALIDN] > region
+CTABLES /TABLE=monthDaysMin1drink [MEAN F8.1, COUNT, VALIDN] > region
     /CATEGORIES VARIABLES=region TOTAL=YES LABEL='All regions'.
diff --git a/doc/pspp-figures/ctables31.sps b/doc/pspp-figures/ctables31.sps
index bde6fa52a8..09b5bc32ee 100644
--- a/doc/pspp-figures/ctables31.sps
+++ b/doc/pspp-figures/ctables31.sps
@@ -1,3 +1,3 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE=qns1.
-CTABLES /TABLE=qns1 /CATEGORIES VARIABLES=qns1 EMPTY=EXCLUDE.
+CTABLES /TABLE=membersOver16.
+CTABLES /TABLE=membersOver16 /CATEGORIES VARIABLES=membersOver16 EMPTY=EXCLUDE.
diff --git a/doc/pspp-figures/ctables35.sps b/doc/pspp-figures/ctables35.sps
index 7024f9d707..71ceb11114 100644
--- a/doc/pspp-figures/ctables35.sps
+++ b/doc/pspp-figures/ctables35.sps
@@ -4,8 +4,8 @@ CTABLES
     /PPROPERTIES &all_drivers LABEL='All Drivers'
     /PCOMPUTE &pct_never=EXPR([5] / ([1 THRU 2] + [3 THRU 4] + [5]) * 100)
     /PPROPERTIES &pct_never LABEL='% Not Drivers' FORMAT=COUNT PCT40.1
-    /TABLE=qn1 BY qns3a
-    /CATEGORIES VARIABLES=qn1 [1 THRU 2, SUBTOTAL='Frequent Drivers',
-                               3 THRU 4, SUBTOTAL='Infrequent Drivers',
-			       &all_drivers, 5, &pct_never,
-			       MISSING, SUBTOTAL='Not Drivers or Missing'].
+    /TABLE=freqOfDriving BY gender
+    /CATEGORIES VARIABLES=freqOfDriving [1 THRU 2,SUBTOTAL='Frequent Drivers',
+					 3 THRU 4, SUBTOTAL='Infrequent Drivers',
+					 &all_drivers, 5, &pct_never,
+					 MISSING, SUBTOTAL='Not Drivers or Missing'].
diff --git a/doc/pspp-figures/ctables36.sps b/doc/pspp-figures/ctables36.sps
index 6ee7387aaa..76125cd74d 100644
--- a/doc/pspp-figures/ctables36.sps
+++ b/doc/pspp-figures/ctables36.sps
@@ -1,2 +1,2 @@
 GET FILE='nhtsa.sav'.
-CTABLES /HIDESMALLCOUNTS COUNT=10 /TABLE qn37.
+CTABLES /HIDESMALLCOUNTS COUNT=10 /TABLE placeOfLastDrinkBeforeDrive.
diff --git a/doc/pspp-figures/ctables4.sps b/doc/pspp-figures/ctables4.sps
index 4ddee23ef6..a569b0cbbb 100644
--- a/doc/pspp-figures/ctables4.sps
+++ b/doc/pspp-figures/ctables4.sps
@@ -1,2 +1,2 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE AgeGroup + qn1 BY qns3a.
+CTABLES /TABLE ageGroup + freqOfDriving BY gender.
diff --git a/doc/pspp-figures/ctables5.sps b/doc/pspp-figures/ctables5.sps
index ba12f4b7a2..12f35f2dea 100644
--- a/doc/pspp-figures/ctables5.sps
+++ b/doc/pspp-figures/ctables5.sps
@@ -1,3 +1,3 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE qn26 + qn27 > qns3a.
-CTABLES /TABLE (qn26 + qn27) > qns3a.
+CTABLES /TABLE hasConsideredReduction + hasBeenCriticized > gender.
+CTABLES /TABLE (hasConsideredReduction + hasBeenCriticized) > gender.
diff --git a/doc/pspp-figures/ctables6.sps b/doc/pspp-figures/ctables6.sps
index 9cbaf89cc5..b584c9b734 100644
--- a/doc/pspp-figures/ctables6.sps
+++ b/doc/pspp-figures/ctables6.sps
@@ -1,2 +1,2 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE qnd1.
+CTABLES /TABLE age.
diff --git a/doc/pspp-figures/ctables7.sps b/doc/pspp-figures/ctables7.sps
index 678570a26b..3e11613189 100644
--- a/doc/pspp-figures/ctables7.sps
+++ b/doc/pspp-figures/ctables7.sps
@@ -1,2 +1,2 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE qnd1 > qns3a BY lang.
+CTABLES /TABLE age > gender BY lang.
diff --git a/doc/pspp-figures/ctables8.sps b/doc/pspp-figures/ctables8.sps
index 799195ace5..8fb0e2d34e 100644
--- a/doc/pspp-figures/ctables8.sps
+++ b/doc/pspp-figures/ctables8.sps
@@ -1,2 +1,2 @@
 GET FILE='nhtsa.sav'.
-CTABLES /TABLE qns3a > qnd1 BY lang.
+CTABLES /TABLE gender > age BY lang.
diff --git a/doc/pspp-figures/ctables9.sps b/doc/pspp-figures/ctables9.sps
index e0494444bb..12e8d30915 100644
--- a/doc/pspp-figures/ctables9.sps
+++ b/doc/pspp-figures/ctables9.sps
@@ -1,4 +1,4 @@
 GET FILE='nhtsa.sav'.
 CTABLES
-    /TABLE qn20 BY qns3a
-    /TABLE qn20 [C] BY qns3a.
+    /TABLE monthDaysMin1drink BY gender
+    /TABLE monthDaysMin1drink [C] BY gender.
diff --git a/doc/statistics.texi b/doc/statistics.texi
index e23f894080..f8a06afd13 100644
--- a/doc/statistics.texi
+++ b/doc/statistics.texi
@@ -999,7 +999,7 @@ This section's examples use data from the 2008 (USA) National Survey
 of Drinking and Driving Attitudes and Behaviors, a public domain data
 set from the (USA) National Highway Traffic Administration and
 available at @url{https://data.transportation.gov}.  @pspp{} includes
-this data set, with a slightly modified dictionary, as
+this data set, with a modified dictionary, as
 @file{examples/nhtsa.sav}.
 
 @node CTABLES Basics
@@ -1026,7 +1026,7 @@ variable yields a frequency table, much like the output of the
 @code{FREQUENCIES} command (@pxref{FREQUENCIES}):
 
 @example
-CTABLES /TABLE=AgeGroup.
+CTABLES /TABLE=ageGroup.
 @end example
 @psppoutput {ctables1}
 
@@ -1036,7 +1036,7 @@ crosstabulation, much like the output of the @code{CROSSTABS} command
 (@pxref{CROSSTABS}):
 
 @example
-CTABLES /TABLE=AgeGroup BY qns3a.
+CTABLES /TABLE=ageGroup BY gender.
 @end example
 @psppoutput {ctables2}
 
@@ -1045,7 +1045,7 @@ The @samp{>} ``nesting'' operator nests multiple variables on a single
 axis, e.g.:
 
 @example
-CTABLES /TABLE qn105ba BY AgeGroup > qns3a.
+CTABLES /TABLE likelihoodOfBeingStoppedByPolice BY ageGroup > gender.
 @end example
 @psppoutput {ctables3}
 
@@ -1057,7 +1057,7 @@ an analysis of the full data set.  For example, the following command
 separately tabulates age group and driving frequency by gender:
 
 @example
-CTABLES /TABLE AgeGroup + qn1 BY qns3a.
+CTABLES /TABLE ageGroup + freqOfDriving BY gender.
 @end example
 @psppoutput {ctables4}
 
@@ -1066,8 +1066,8 @@ When @samp{+} and @samp{>} are used together, @samp{>} binds more
 tightly.  Use parentheses to override operator precedence.  Thus:
 
 @example
-CTABLES /TABLE qn26 + qn27 > qns3a.
-CTABLES /TABLE (qn26 + qn27) > qns3a.
+CTABLES /TABLE hasConsideredReduction + hasBeenCriticized > gender.
+CTABLES /TABLE (hasConsideredReduction + hasBeenCriticized) > gender.
 @end example
 @psppoutput {ctables5}
 
@@ -1082,7 +1082,7 @@ scalar variable, then the output is a single cell that holds the mean
 of all of the data:
 
 @example
-CTABLES /TABLE qnd1.
+CTABLES /TABLE age.
 @end example
 @psppoutput {ctables6}
 
@@ -1091,7 +1091,7 @@ example shows the mean age of survey respondents across gender and
 language groups:
 
 @example
-CTABLES /TABLE qns3a > qnd1 BY region.
+CTABLES /TABLE gender > age BY region.
 @end example
 @psppoutput {ctables7}
 
@@ -1101,7 +1101,7 @@ following example shows how the output changes when the nesting order
 of the scalar and categorical variable are interchanged:
 
 @example
-CTABLES /TABLE qnd1 > qns3a BY region.
+CTABLES /TABLE age > gender BY region.
 @end example
 @psppoutput {ctables8}
 
@@ -1129,13 +1129,13 @@ variable's measurement level (@pxref{VARIABLE LEVEL}).
 To treat a variable as categorical or scalar only for one use on
 @code{CTABLES}, add @samp{[C]} or @samp{[S]}, respectively, after the
 variable name.  The following example shows the output when variable
-@code{qn20} is analyzed as scalar (the default for its measurement
+@code{monthDaysMin1drink} is analyzed as scalar (the default for its measurement
 level) and as categorical:
 
 @example
 CTABLES
-    /TABLE qn20 BY qns3a
-    /TABLE qn20 [C] BY qns3a.
+    /TABLE monthDaysMin1drink BY gender
+    /TABLE monthDaysMin1drink [C] BY gender.
 @end example
 @psppoutput {ctables9}
 
@@ -1165,8 +1165,8 @@ scalar variable:
 
 @example
 CTABLES
-    /TABLE=qnd1 [MEAN, MEDIAN] BY qns3a
-    /TABLE=AgeGroup [COLPCT, ROWPCT] BY qns3a.
+    /TABLE=age [MEAN, MEDIAN] BY gender
+    /TABLE=ageGroup [COLPCT, ROWPCT] BY gender.
 @end example
 @psppoutput {ctables10}
 
@@ -1175,9 +1175,9 @@ appending a string or format specification or both (in that order) to
 the summary function name.  For example:
 
 @example
-CTABLES /TABLE=AgeGroup [COLPCT 'Gender %' PCT5.0,
+CTABLES /TABLE=ageGroup [COLPCT 'Gender %' PCT5.0,
                          ROWPCT 'Age Group %' PCT5.0]
-               BY qns3a.
+               BY gender.
 @end example
 @psppoutput {ctables11}
 
@@ -1210,8 +1210,8 @@ Parentheses provide a shorthand to apply summary specifications to
 multiple variables.  For example, both of these commands:
 
 @example
-CTABLES /TABLE=AgeGroup[COLPCT] + qns1[COLPCT] BY qns3a.
-CTABLES /TABLE=(AgeGroup + qns1)[COLPCT] BY qns3a.
+CTABLES /TABLE=ageGroup[COLPCT] + membersOver16[COLPCT] BY gender.
+CTABLES /TABLE=(ageGroup + membersOver16)[COLPCT] BY gender.
 @end example
 
 @noindent
@@ -1331,13 +1331,16 @@ A @dfn{subtable}, whose contents are the cells that pair an innermost
 row variable and an innermost column variable within a single layer.
 @end table
 
-The following shows how the output for the table expression @code{qn61
-> qn57 BY qnd7a > qn86 + qn64b BY qns3a}@footnote{This is not
-necessarily a meaningful table, so for clarity variable labels are
-omitted.} is divided up into @code{TABLE}, @code{LAYER}, and
-@code{SUBTABLE} areas.  Each unique value for Table ID is one section,
-and similarly for Layer ID and Subtable ID.  Thus, this output has two
-@code{TABLE} areas (one for @code{qnd7a} and one for @code{qn64b}),
+The following shows how the output for the table expression
+@code{hasBeenPassengerOfDesignatedDriver >
+hasBeenPassengerOfDrunkDriver BY isLicensedDriver >
+hasHostedEventWithAlcohol + hasBeenDesignatedDriver BY
+gender}@footnote{This is not necessarily a meaningful table.  To make
+it easier to read, short variable labels are used.} is divided up into
+@code{TABLE}, @code{LAYER}, and @code{SUBTABLE} areas.  Each unique
+value for Table ID is one section, and similarly for Layer ID and
+Subtable ID.  Thus, this output has two @code{TABLE} areas (one for
+@code{isLicensedDriver} and one for @code{hasBeenDesignatedDriver}),
 four @code{LAYER} areas (for those two variables, per layer), and 12
 @code{SUBTABLE} areas.
 @psppoutput {ctables22}
@@ -1472,7 +1475,7 @@ With @t{POSITION=COLUMN}, which is the default, each summary statistic
 appears in a column.  For example:
 
 @example
-CTABLES /TABLE=qnd1 [MEAN, MEDIAN] BY qns3a.
+CTABLES /TABLE=age [MEAN, MEDIAN] BY gender.
 @end example
 @psppoutput {ctables13}
 
@@ -1481,7 +1484,7 @@ With @t{POSITION=ROW}, each summary statistic appears in a row, as
 shown below:
 
 @example
-CTABLES /TABLE=qnd1 [MEAN, MEDIAN] BY qns3a /SLABELS POSITION=ROW.
+CTABLES /TABLE=age [MEAN, MEDIAN] BY gender /SLABELS POSITION=ROW.
 @end example
 @psppoutput {ctables14}
 
@@ -1495,7 +1498,7 @@ confusion, it should only be considered if the meaning of the data is
 evident, as in a simple case like this:
 
 @example
-CTABLES /TABLE=AgeGroup [TABLEPCT] /SLABELS VISIBLE=NO.
+CTABLES /TABLE=ageGroup [TABLEPCT] /SLABELS VISIBLE=NO.
 @end example
 @psppoutput {ctables15}
 
@@ -1515,7 +1518,7 @@ variable on the rows axis and gender categories within the gender
 variable on the columns axis:
 
 @example
-CTABLES /TABLE AgeGroup BY qns3a.
+CTABLES /TABLE ageGroup BY gender.
 @end example
 @psppoutput {ctables16}
 
@@ -1525,8 +1528,8 @@ setting affects only the innermost variable or variables, which must
 be categorical, on the given axis.  For example:
 
 @example
-CTABLES /TABLE AgeGroup BY qns3a /CLABELS ROWLABELS=OPPOSITE.
-CTABLES /TABLE AgeGroup BY qns3a /CLABELS COLLABELS=OPPOSITE.
+CTABLES /TABLE ageGroup BY gender /CLABELS ROWLABELS=OPPOSITE.
+CTABLES /TABLE ageGroup BY gender /CLABELS COLLABELS=OPPOSITE.
 @end example
 @psppoutput {ctables17}
 
@@ -1546,7 +1549,7 @@ change the definitions of these areas.
 For example, consider the following syntax and output:
 
 @example
-CTABLES /TABLE AgeGroup BY qns3a [ROWPCT, COLPCT].
+CTABLES /TABLE ageGroup BY gender [ROWPCT, COLPCT].
 @end example
 @psppoutput {ctables23}
 
@@ -1558,7 +1561,7 @@ there is only one cell per row):
 
 @example
 CTABLES
-    /TABLE AgeGroup BY qns3a [ROWPCT, COLPCT]
+    /TABLE ageGroup BY gender [ROWPCT, COLPCT]
     /CLABELS COLLABELS=OPPOSITE.
 @end example
 @psppoutput {ctables24}
@@ -1574,8 +1577,10 @@ The following shows both moving stacked category variables and
 adapting to the changing definitions of rows and columns:
 
 @example
-CTABLES /TABLE (qn105ba + qn105bb) [COLPCT].
-CTABLES /TABLE (qn105ba + qn105bb) [ROWPCT]
+CTABLES /TABLE (likelihoodOfBeingStoppedByPolice
+                + likelihoodOfHavingAnAccident) [COLPCT].
+CTABLES /TABLE (likelihoodOfBeingStoppedByPolice
+                + likelihoodOfHavingAnAccident) [ROWPCT]
   /CLABELS ROW=OPPOSITE.
 @end example
 @psppoutput {ctables25}
@@ -1663,8 +1668,8 @@ The following example syntax and output show how an explicit category
 can limit the displayed categories:
 
 @example
-CTABLES /TABLE qn1.
-CTABLES /TABLE qn1 /CATEGORIES VARIABLES=qn1 [1, 2, 3].
+CTABLES /TABLE freqOfDriving.
+CTABLES /TABLE freqOfDriving /CATEGORIES VARIABLES=freqOfDriving [1, 2, 3].
 @end example
 @psppoutput {ctables27}
 
@@ -1681,10 +1686,10 @@ also be sorted by value label, with @code{KEY=LABEL}, or by the value
 of a summary function, e.g.@: @code{KEY=COUNT}.
 @ignore  @c Not yet implemented
 For summary functions, a variable name may be specified in
-parentheses, e.g.@: @code{KEY=MAXIUM(qnd1)}, and this is required for
+parentheses, e.g.@: @code{KEY=MAXIUM(age)}, and this is required for
 functions that apply only to scalar variables.  The @code{PTILE}
 function also requires a percentage argument, e.g.@:
-@code{KEY=PTILE(qnd1, 90)}.  Only summary functions used in the table
+@code{KEY=PTILE(age, 90)}.  Only summary functions used in the table
 may be used, except that @code{COUNT} is always allowed.
 @end ignore
 
@@ -1700,8 +1705,9 @@ The following example syntax and output show how
 category list.
 
 @example
-CTABLES /TABLE qn1.
-CTABLES /TABLE qn1 /CATEGORIES VARIABLES=qn1 MISSING=INCLUDE.
+CTABLES /TABLE freqOfDriving.
+CTABLES /TABLE freqOfDriving
+        /CATEGORIES VARIABLES=freqOfDriving MISSING=INCLUDE.
 @end example
 @psppoutput {ctables28}
 
@@ -1727,10 +1733,10 @@ The following example syntax and output show how to use
 
 @example
 CTABLES
-    /TABLE qn1
-    /CATEGORIES VARIABLES=qn1 [OTHERNM, SUBTOTAL='Valid Total',
-                               MISSING, SUBTOTAL='Missing Total']
-			      TOTAL=YES LABEL='Overall Total'.
+    /TABLE freqOfDriving
+    /CATEGORIES VARIABLES=freqOfDriving [OTHERNM, SUBTOTAL='Valid Total',
+                                         MISSING, SUBTOTAL='Missing Total']
+                                        TOTAL=YES LABEL='Overall Total'.
 @end example
 @psppoutput {ctables29}
 
@@ -1747,7 +1753,7 @@ count, and valid count across all data by adding a total on the
 categorical @code{region} variable, as shown:
 
 @example
-CTABLES /TABLE=region > qn20 [MEAN, VALIDN]
+CTABLES /TABLE=region > monthDaysMin1drink [MEAN, VALIDN]
     /CATEGORIES VARIABLES=region TOTAL=YES LABEL='All regions'.
 @end example
 @psppoutput {ctables30}
@@ -1762,8 +1768,8 @@ for totals, as shown:
 
 @example
 CTABLES
-    /TABLE qnd7a [COUNT, TOTALS[COUNT, VALIDN]]
-    /CATEGORIES VARIABLES=qnd7a TOTAL=YES MISSING=INCLUDE.
+    /TABLE isLicensedDriver [COUNT, TOTALS[COUNT, VALIDN]]
+    /CATEGORIES VARIABLES=isLicensedDriver TOTAL=YES MISSING=INCLUDE.
 @end example
 @psppoutput {ctables26}
 
@@ -1783,12 +1789,12 @@ values with value labels that are covered by ranges or @code{MISSING}
 or @code{OTHERNM}.
 
 The following example syntax and output show the effect of
-@code{EMPTY=EXCLUDE} for the @code{qns1} variable, in which 0 is labeled
-``None'' but no cases exist with that value:
+@code{EMPTY=EXCLUDE} for the @code{membersOver16} variable, in which 0
+is labeled ``None'' but no cases exist with that value:
 
 @example
-CTABLES /TABLE=qns1.
-CTABLES /TABLE=qns1 /CATEGORIES VARIABLES=qns1 EMPTY=EXCLUDE.
+CTABLES /TABLE=membersOver16.
+CTABLES /TABLE=membersOver16 /CATEGORIES VARIABLES=membersOver16 EMPTY=EXCLUDE.
 @end example
 @psppoutput {ctables31}
 
@@ -2145,11 +2151,12 @@ CTABLES
     /PPROPERTIES &all_drivers LABEL='All Drivers'
     /PCOMPUTE &pct_never=EXPR([5] / ([1 THRU 2] + [3 THRU 4] + [5]) * 100)
     /PPROPERTIES &pct_never LABEL='% Not Drivers' FORMAT=COUNT PCT40.1
-    /TABLE=qn1 BY qns3a
-    /CATEGORIES VARIABLES=qn1 [1 THRU 2, SUBTOTAL='Frequent Drivers',
-                               3 THRU 4, SUBTOTAL='Infrequent Drivers',
-			       &all_drivers, 5, &pct_never,
-			       MISSING, SUBTOTAL='Not Drivers or Missing'].
+    /TABLE=freqOfDriving BY gender
+    /CATEGORIES VARIABLES=freqOfDriving
+                             [1 THRU 2, SUBTOTAL='Frequent Drivers',
+                              3 THRU 4, SUBTOTAL='Infrequent Drivers',
+                              &all_drivers, 5, &pct_never,
+                              MISSING, SUBTOTAL='Not Drivers or Missing'].
 @end example
 @psppoutput{ctables35}
 
@@ -2223,7 +2230,7 @@ The following syntax and example shows how to use
 @code{HIDESMALLCOUNTS}:
 
 @example
-CTABLES /HIDESMALLCOUNTS COUNT=10 /TABLE qn37.
+CTABLES /HIDESMALLCOUNTS COUNT=10 /TABLE placeOfLastDrinkBeforeDrive.
 @end example
 @psppoutput{ctables36}
 
diff --git a/examples/nhtsa-drinking-2008.sps b/examples/nhtsa-drinking-2008.sps
index 84cbc6a440..db2b1c235b 100644
--- a/examples/nhtsa-drinking-2008.sps
+++ b/examples/nhtsa-drinking-2008.sps
@@ -99,4 +99,117 @@ VALUE LABELS
      5 '46 to 55'
      6 '56 to 65'
      7 '66 or older'.
+RENAME VARIABLES
+  (QNSA1 = sampleSource)
+  (QNS1 = membersOver16)
+  (QNS3A = gender)
+  (QN1 = freqOfDriving)
+  (QN15 = freqOfDrinking)
+  (QN17 = mostFreqBeverage)
+  (QN18 = portionsPerSitting)
+  (QN19A = startAgeOfDrinking)
+  (qn20 = monthDaysMin1drink)
+  (qn23 = monthDaysMin5drinks)
+  (QN26 = hasConsideredReduction)
+  (QN27 = hasBeenCriticized)
+  (QN28 = hasFeltBadOrGuilty)
+  (QN29 = hasDrunkInMorning)
+  (qn31 = portionsConsideredSafe2Hrs)
+  (QN33 = hasDrivenAfterDrinking)
+  (qn35 = timesDrivenAfterDrinking30Days)
+  (qn36 = monthsSinceLastDriveAfterDrink)
+  (QN37 = placeOfLastDrinkBeforeDrive)
+  (qn38 = portionsOfLastDrinkBeforeDrive)
+  (QN39H = lengthOfLastDrinkBeforeDriveHrs)
+  (QN39M = lengthOfLastDrinkBeforeDriveMins)
+  (qn39 = lengthOfLastDrinkBeforeDrive)
+  (qn41 = timeBetweenLastDrinkAndDrive)
+  (QN43A = woreSeatbeltLastDriveAfterDrink)
+  (qn44 = nPassengersLastDriveAfterDrink)
+  (qn44a = nPassengersUnder15LastDriveAfterDrink)
+  (QN49 = positionVsLegalLimitLastDriveAfterDrink)
+  (qn52 = timesOverLegalLimit12Months)
+  (QN54 = hasAvoidedDrivingAfterDrink)
+  (QN56 = alternativeUsedLastTimeAvoided)
+  (QN57 = hasBeenPassengerOfDrunkDriver)
+  (QN61 = hasBeenPassengerOfDesignatedDriver)
+  (QN64B = hasBeenDesignatedDriver)
+  (qn65 = nPortionsLastTimeAsDesignatedDriver)
+  (QN65A = momentOfDesignation)
+  (qn66 = nPortionsMaxDesignatedDriver)
+  (QN86 = hasHostedEventWithAlcohol)
+  (QN87 = levelOfConcernAboutDrivingAtLastEvent)
+  (QN88_1 = measuresAgainstDrivingAfterDrinkAtLastEvent_1)
+  (QN88_2 = measuresAgainstDrivingAfterDrinkAtLastEvent_2)
+  (QN88_3 = measuresAgainstDrivingAfterDrinkAtLastEvent_3)
+  (QN89 = hasHostedEventForYouthUnder21)
+  (QN90 = hasMonitoredAlcoholConsumptionAtLastEventUnder21)
+  (QN90A = youthUnder21HasDrunkAlcoholAtLastEvent)
+  (QN91_1 = measuresAgainstDrivingAfterDrinkAtLastEventUnder21_1)
+  (QN91_2 = measuresAgainstDrivingAfterDrinkAtLastEventUnder21_2)
+  (QN91_3 = measuresAgainstDrivingAfterDrinkAtLastEventUnder21_3)
+  (QN96A = hasWitnessedDrunkPersonPlanningToDrive)
+  (QN100 = hasTriedToStopDrunkPersonFromDriving)
+  (QN101 = measuresToStopDrunkPersonFromDriving)
+  (QN102 = drunkPersonDroveAnyhow)
+  (QN102B = hasBeenEncouragedToDrinkMoreThanPlanned)
+  (QN102C = hasFeltCompelledToDrink)
+  (QN103 = levelOfThreatDrinkingAndDrivingByOtherPeople)
+  (QN105BA = likelihoodOfBeingStoppedByPolice)
+  (QN105BB = likelihoodOfHavingAnAccident)
+  (QN105BC = likelihoodOfBeingConvicted)
+  (QN105BD = likelihoodOfBeingArrested)
+  (QN113 = hasBeenArrestedForDrinkingAndDriving)
+  (qn114 = numberOfArrestsLast2Years)
+  (QN116 = opinionAboutSeverityOfPenalties)
+  (QN120 = hasSeenSobrietyCheckpoint)
+  (qn121 = numberOfSobrietyCheckpointsCrossed12Months)
+  (QN122C = desiredFrequencyOfSobrietyCheckpoints)
+  (QN123 = awarenessOfBAClevels)
+  (qn126 = portionsCorrespondingToBAC.08)
+  (QN131A = hasBeenInvolvedInCrash)
+  (QN132A = alcoholInvolvedInLastCrash)
+  (QN133 = injuriesInLastCrash)
+  (QN139A = effectivenessPoliceEfforts)
+  (QN139E = effectivenessAlternativeTransport)
+  (QN139G = effectivenessTreatment)
+  (QN139H = effectivenessPenaltiesLicensedEstablishments)
+  (QN139K = effectivenessPenaltiesPartyHosts)
+  (QN139L = effectivenessSuspensionOfLicense)
+  (QN139M = effectivenessConfiscationOfVehicle)
+  (QN139N = effectivenessBreathLock)
+  (QN139_A = awarenessNationalMinimumDrinkingAge)
+  (QN139_B = minimumNationalDrinkingAge)
+  (QN139CA = effectivenessUnder21PoliceEfforts)
+  (QN139CE = effectivenessUnder21AlternativeTransport)
+  (QN139CF = effectivenessUnder21LimitingAmount)
+  (QN139CG = effectivenessUnder21Treatment)
+  (QN139CH = effectivenessUnder21PenaltiesLicensedEstablishments)
+  (QN139CK = effectivenessUnder21PenaltiesPartyHosts)
+  (QN139CL = effectivenessUnder21SuspensionOfLicense)
+  (QN139CN = effectivenessUnder21BreathLock)
+  (QN140AA = support1stTimeSuspensionOfLicense)
+  (QN140AB = support1stTimeJail)
+  (QN140AC = support1stTimeConfiscationOfVehicle)
+  (QN140AD = support1stTimeBreathLock)
+  (QN140AE = supportConfiscationOfLicensePlates)
+  (QN140AF = supportCompulsaryTreatment)
+  (qnd1 = age)
+  (QND1B = numberOfChildrenUnder16)
+  (QND2_1 = employmentStatus_1)
+  (QND2_2 = employmentStatus_2)
+  (QND2_3 = employmentStatus_3)
+  (QND3 = education)
+  (QND5 = hispanicOrLatino)
+  (QND5A = ethnicBackground)
+  (QND6_1 = race_1)
+  (QND6_2 = race_2)
+  (QND6_3 = race_3)
+  (QND6_4 = race_4)
+  (QND6_5 = race_5)
+  (QND7A = isLicensedDriver)
+  (QND8 = income)
+  (qnd9 = weightOfRespondent)
+  (QND11A = singleLandLinePhoneNumber)
+  (QND11 = nLandLinePhoneNumbers).
 SAVE OUTFILE='nhtsa.sav'.
diff --git a/examples/nhtsa.sav b/examples/nhtsa.sav
index 48d0143544..13aca72fd5 100644
Binary files a/examples/nhtsa.sav and b/examples/nhtsa.sav differ
diff --git a/tests/automake.mk b/tests/automake.mk
index b39a7bbebb..d9616c9c6a 100644
--- a/tests/automake.mk
+++ b/tests/automake.mk
@@ -316,6 +316,7 @@ EXTRA_DIST += \
 	tests/language/data-io/test.ods \
 	tests/language/data-io/newone.ods \
 	tests/language/data-io/readnames.ods \
+	tests/language/stats/nhtsa.sav \
 	tests/language/stats/llz.zsav \
 	tests/utilities/regress.spv
 
diff --git a/tests/language/stats/ctables.at b/tests/language/stats/ctables.at
index 61db4e8126..8ec85d170c 100644
--- a/tests/language/stats/ctables.at
+++ b/tests/language/stats/ctables.at
@@ -49,7 +49,7 @@ dnl - CATEGORIES:
 dnl   * Data-dependent sorting.
 
 AT_SETUP([CTABLES parsing])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES
@@ -118,7 +118,7 @@ RDD
 AT_CLEANUP
 
 AT_SETUP([CTABLES parsing - negative])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES.
@@ -711,7 +711,7 @@ specification as format DATETIME: Day (123) must be between 1 and 31..
 AT_CLEANUP
 
 AT_SETUP([CTABLES parsing - more negative])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES /PCOMPUTE &pc=EXPR(SUBTOTAL) /TABLE qn1 /CATEGORIES VARIABLES=qn1 [&pc].
@@ -900,7 +900,7 @@ ctables.sps:36.10-36.15: note: CTABLES: TABLE must appear before this subcommand
 AT_CLEANUP
 
 AT_SETUP([CTABLES one categorical variable])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES /TABLE qn1.
@@ -943,7 +943,7 @@ Every day
 AT_CLEANUP
 
 AT_SETUP([CTABLES one string variable])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 STRING licensed(A8).
@@ -1033,7 +1033,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=80], [0], [dnl
 AT_CLEANUP
 
 AT_SETUP([CTABLES one scale variable])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 DESCRIPTIVES qnd1.
@@ -1081,7 +1081,7 @@ AT_CLEANUP
 
 AT_SETUP([CTABLES simple stacking])
 AT_KEYWORDS([stack stacked])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES /TABLE qn105ba + qn105bb + qn105bc + qn105bd BY qns3a [COLPCT PCT8.0].
@@ -1140,7 +1140,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=80], [0], [dnl
 AT_CLEANUP
 
 AT_SETUP([CTABLES show or hide empty categories])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 IF (qn105ba = 2) qn105ba = 1.
@@ -1235,7 +1235,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=80], [0], [dnl
 AT_CLEANUP
 
 AT_SETUP([CTABLES sorting categories])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 IF (QND5A=6) QND5A=-1.
@@ -1318,7 +1318,7 @@ AT_CLEANUP
 
 AT_SETUP([CTABLES simple nesting])
 AT_KEYWORDS([nest nested])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES /TABLE (qn105ba + qn105bb + qn105bc + qn105bd) > qns3a [COUNT, TABLEPCT PCT8.0]
@@ -1523,7 +1523,7 @@ AT_CLEANUP
 
 AT_SETUP([CTABLES nesting and scale variables])
 AT_KEYWORDS([nest nested])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES /TABLE=qnd1 > qn1 BY qns3a.
@@ -1642,7 +1642,7 @@ AT_CLEANUP
 
 
 AT_SETUP([CTABLES SLABELS])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES /TABLE qn1 [COUNT COLPCT].
@@ -1705,7 +1705,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=80], [0], [dnl
 AT_CLEANUP
 
 AT_SETUP([CTABLES simple totals])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES /TABLE=qn17
@@ -1770,7 +1770,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=80], [0], [dnl
 AT_CLEANUP
 
 AT_SETUP([CTABLES subtotals])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES /TABLE=qn105ba BY qns1
@@ -1852,7 +1852,7 @@ AT_CLEANUP
 
 AT_SETUP([CTABLES PCOMPUTE])
 AT_KEYWORDS([postcompute])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES
@@ -1924,7 +1924,7 @@ AT_CLEANUP
 
 AT_SETUP([CTABLES PCOMPUTE - OTHERNM and MISSING])
 AT_KEYWORDS([postcompute])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES
@@ -1961,7 +1961,7 @@ AT_CLEANUP
 
 AT_SETUP([CTABLES PCOMPUTE - THRU])
 AT_KEYWORDS([postcompute])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES
@@ -2116,7 +2116,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=120], [0], [dnl
 AT_CLEANUP
 
 AT_SETUP([CTABLES CLABELS])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES /TABLE AgeGroup BY qns3a.
@@ -2621,7 +2621,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=120], [0], [dnl
 AT_CLEANUP
 
 AT_SETUP([CTABLES VLABELS - variables on different axes])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES /VLABELS VARIABLES=qns3a qnd5a DISPLAY=DEFAULT /TABLE qnd5a BY qns3a.
@@ -2727,7 +2727,7 @@ AT_CLEANUP
 
 AT_SETUP([CTABLES VLABELS - stacked variables])
 AT_KEYWORDS([stack stacking])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES /VLABELS VARIABLES=qns3a DISPLAY=NAME /TABLE qnd5a + qns3a.
@@ -2835,7 +2835,7 @@ AT_CLEANUP
 
 AT_SETUP([CTABLES VLABELS - nested variables])
 AT_KEYWORDS([nest nesting])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES /VLABELS VARIABLES=qns3a DISPLAY=NAME /TABLE qnd5a > qns3a.
@@ -2993,7 +2993,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode], [0], [dnl
 AT_CLEANUP
 
 AT_SETUP([CTABLES FORMAT EMPTY])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES /FORMAT EMPTY=ZERO /TABLE qnd5a BY qnd5.
@@ -3070,7 +3070,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode], [0], [dnl
 AT_CLEANUP
 
 AT_SETUP([CTABLES FORMAT MISSING])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES /FORMAT MISSING='(no data)' /TABLE qnd5a[COLPCT] BY qnd5.
@@ -3101,7 +3101,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode], [0], [dnl
 AT_CLEANUP
 
 AT_SETUP([CTABLES HIDESMALLCOUNTS])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES /TABLE qn38[c][COUNT, COLPCT].
@@ -3193,7 +3193,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode], [0], [dnl
 AT_CLEANUP
 
 AT_SETUP([CTABLES FORMAT MINCOLWIDTH MAXCOLWIDTH])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES /FORMAT MINCOLWIDTH=1 MAXCOLWIDTH=2 UNITS=INCHES /TABLE BY qns3a.
@@ -3219,7 +3219,7 @@ AT_CLEANUP
 
 AT_SETUP([CTABLES special formats])
 AT_KEYWORDS([NEGPAREN NEQUAL PAREN PCTPAREN])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 COMPUTE x = qnd3 - 4.
@@ -3236,7 +3236,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode], [0], [dnl
 AT_CLEANUP
 
 AT_SETUP([CTABLES TITLES])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES
@@ -3274,7 +3274,7 @@ Generated HH:MM:SS on MM/DD/YY
 AT_CLEANUP
 
 AT_SETUP([CTABLES area definitions])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES
@@ -3443,7 +3443,7 @@ AT_CLEANUP
 
 AT_SETUP([CTABLES area definitions with CLABELS ROWLABELS=OPPOSITE])
 AT_KEYWORDS([ROWLABELS OPPOSITE])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES
@@ -3651,7 +3651,7 @@ AT_CLEANUP
 
 AT_SETUP([CTABLES area definitions with CLABELS COLLABELS=OPPOSITE])
 AT_KEYWORDS([COLLABELS OPPOSITE])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES
@@ -4075,7 +4075,7 @@ AT_CLEANUP
 
 AT_SETUP([CTABLES area definitions with CLABELS ROWLABELS=LAYER])
 AT_KEYWORDS([ROWLABELS LAYER])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES
@@ -4459,7 +4459,7 @@ AT_CLEANUP
 
 AT_SETUP([CTABLES area definitions with CLABELS COLLABELS=LAYER])
 AT_KEYWORDS([COLLABELS LAYER])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES
@@ -4978,7 +4978,7 @@ No
 AT_CLEANUP
 
 AT_SETUP([CTABLES categorical summary functions])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES
@@ -5043,7 +5043,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=120], [0], [dnl
 AT_CLEANUP
 
 AT_SETUP([CTABLES scale summary functions])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 SET TVAR=NAME.
@@ -5325,7 +5325,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode -O width=120], [0], [dnl
 AT_CLEANUP
 
 AT_SETUP([CTABLES hidden scale VLABELS])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 CTABLES
@@ -5413,7 +5413,7 @@ AT_CHECK([pspp ctables.sps -O box=unicode], [0], [dnl
 AT_CLEANUP
 
 AT_SETUP([CTABLES with SPLIT FILE])
-AT_CHECK([ln $top_srcdir/examples/nhtsa.sav . || cp $top_srcdir/examples/nhtsa.sav .])
+AT_CHECK([ln $top_srcdir/tests/language/stats/nhtsa.sav . || cp $top_srcdir/tests/language/stats/nhtsa.sav .])
 AT_DATA([ctables.sps],
 [[GET 'nhtsa.sav'.
 
diff --git a/tests/language/stats/nhtsa.sav b/tests/language/stats/nhtsa.sav
new file mode 100644
index 0000000000..48d0143544
Binary files /dev/null and b/tests/language/stats/nhtsa.sav differ