Improve Makefile prefixes