Refactored JS names