Correct function keywords

Assume these changed during 1.7-dev