Changed names to work together