rename ScalarFunction members and kernel names
fix makefile