PDFBOX-1990: improve names as suggested by John Hewson

git-svn-id: https://svn.apache.org/repos/asf/pdfbox/trunk@1579073 13f79535-47bb-0310-9956-ffa450edef68