Changed library name and file names