Name refactoring
Adapted to newest libraries