update naming scheme and improve makefile rules