Rename subject_count to subjects_count for consistency