Fixed a naming conflict in Makefiles.
Signed off by: Joe Harkness