PROTON-68: undo change in r1446457: Forgot requested shorter names

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