Changed string values names