Filename refactoring and js fix
Filename refactoring