Beta 6: Renamed Domain Entities