Updates to JS naming and layout