Rename directories back to correct names