We propose an improvement to the maximum a posteriori probability weighted eigenwaveform (MAP-PWE) adaptive waveform design used in target recognition with a cognitive radar platform for which we call match-filtered PWE (MF-PWE). Our interest however is to include moving targets in the identification problem. Combining range-Doppler map (RDM) technique with the the PWE-based adaptive waveform techniques, we propose an integrated detection and identification scheme for moving extended targets. Target detection performance comparison between wideband, MAP-PWE, and MF-PWE techniques are shown. It is noted the MF-PWE performs better than the wideband and MAP-PWE.