Rework makefiles naming