Fix libraries names
Merge pull request #376 from ruslo/libnames-refact

Fix libraries names