Adapted to newest libs
Name refactoring