Improve naming conventions in Entity implementation

[davidmrdavid]

As discussed here: #184

Many parts of our Entity implementation have overloaded terms. For instance, "entity state" is a class name and a variable. This is also true for our JS implementation. We should go over all Entity implementation components and improve their organization and naming.