Replace expand with analyze in analyzer function names