and simplify naming

Change-Id: Ieada4e83fcc2eafd03f65b1216bf5ad026ced4c7
Reviewed-on: https://gerrit.libreoffice.org/66567
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>