diff --git a/org/woehlke/covid19/who/who_model.py b/org/woehlke/covid19/who/who_model.py
index 615fcb7020f361dcede63f6820deb29fb7f56db2..84a3aef0fc0c066e28804d5d5ce93b6cd76e89f6 100644
--- a/org/woehlke/covid19/who/who_model.py
+++ b/org/woehlke/covid19/who/who_model.py
@@ -144,11 +144,11 @@ class WhoGlobalData(db.Model):
     deaths_new = db.Column(db.Integer, nullable=False)
     deaths_cumulative = db.Column(db.Integer, nullable=False)
 
-    who_date_reported_id = db.Column(db.Integer, db.ForeignKey('who_date_reported.id'), nullable=False)
-    who_date_reported = db.relationship('WhoDateReported', lazy='joined')
+    date_reported_id = db.Column(db.Integer, db.ForeignKey('who_date_reported.id'), nullable=False)
+    date_reported = db.relationship('WhoDateReported', lazy='joined')
 
-    who_country_id = db.Column(db.Integer, db.ForeignKey('who_country.id'), nullable=False)
-    who_country = db.relationship('WhoCountry', lazy='joined')
+    country_id = db.Column(db.Integer, db.ForeignKey('who_country.id'), nullable=False)
+    country = db.relationship('WhoCountry', lazy='joined')
 
     @classmethod
     def remove_all(cls):