Added toString() implementation to EntityBase. Changed a few identifier names.