Renamed core libs