Change valueSet constructor to uppercase