Follow: Rename functions to match style and pass query

This commit brings the naming conventions more in line with the other
modules.

It also passes the optional `query` parameter, which was simply passed
as `null` before.