Fix folder name components