Corrected a few functions and types that were partially renamed.
Signed-off-by: Christian Gunderman <cdg46@case.edu>