Fix library names

This should be ready for merge now as well