Refactoring JS
Quick rename
Merge remote-tracking branch 'origin/Development'