Fix naming samples