Refactored Organization.id to Organization.organizationId and updated toString methods to display Id right after object name