Rename and refactor BibUtils