changing field names b/c the spec was incorrectly written