Use the Apache prefix consistently in prose
#17
Merged
Apache prefix consistently in prose
#17