Use consistent naming for functional objects

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
Fix compilation error with clang++

Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>