Update libs, normalize some naming