Housekeeping - correcting folder names