renamed Object/MovableObject to Entity/MovableEntity