Update module calls to reflect API changes upstream.