Jatt and jaat same

Yes Jatt and Jaat are same in Hindi language we used to say jaat and in Punjabi we used to say jatt neither they have no difference as Shahid Bhagat Singh, dara singh ji,deol family and many more belongs to sikh(jatt) but they also say themselves jaat.