simplify some attribute names
Merge branch 'termjs' of github.com:mistio/mist.io into termjs