We should always use the convention name for input to function that we override!

There is more fix that are missing.