Rename for consistency.
Adjust makefile accordingly.