Adapted to newest ssvu
Major name refactoring