Bug fix: Housekeeping class had wrong class name