Change triplet names for consistency with specs; remove triplets from configuration templates