Fix sample names in Makefile
Fix rpm generation