Changed names to match Cards