Rename class according js tests
Merge branch 'fix_autotests'