Re-implement school_name and school_year to maintain compatibility with templates [12743357]