rename handlers
remove dojo/on dependency