Name refactoring, fix compilation, adapted to newest libs