Fixes from Louis.

Louis added the corrections with the name of the functions.