Changed names for consistancy