Adjust name to match more the library names