Another round of renaming
Consistent library names