Renamed some derived Functions to more accurately describe what they are.
Added missing file "scalarfunction.C" from 3 commits back.