Shorten libs name + small changes