Issue #495 : Refactor JS widgets to use the correct namespace - Continued...

Fix for : Refactor JS widgets to use the correct namespace (#495) - Continued...