Rename defines in Entity.h