modelUtil.js -> base/util.js
Unify event handlers name