Give entity data records consistent names
Improve consistency of variable names
Implement gen_entity:subscribe/2
Refactor test module