Updated function name call.
Fixed up vars and targets.