Fixes SLING-2871, made the names of the functions and taglibs more consistent

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