Corrected names and order of libraries