XWIKI-9782: New Crypto Service API

Fix a badly named classes