SLING-2917 rename misleading methods, variables and constant

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