Changed names to uppercase