Fixed some minor bugs involving different function names being used for the same function.