7156000: Change makefile to reflect refactored classes

Reviewed-by: dholmes
1 file changed