Fix constant names in builder