more reasonable naming of libraries