Updated vars in javascript app/model to use <module>-<type>
Updated names to be consistent