Updated Sandbox and Tools sample databases to use entityId instead of EntityId