Move unicode collection/directory names into the spec file