Cleanup: Nameing

references https://github.com/easybib/issues/issues/1928