Switching company_id/library_id to company/libary, to standardize.