Updated Makefile to have more consistent name for common folder