Adapted to newest ssvu
File name refactoring