CLEREZZA-815: made naming more consistent

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