Standardized the library names.