Changed property names to match tests