Issue #72: Renamed 'DC' tenant to 'demo'.
Issue #78: Fix.