Updated Samples and fixed namings