Z21, a Type 1936 destroyer, was a named after Wilhelm Heidkamp. She was commissioned on June 10th, 1939. The ship was improved and enlarged versions of the 1934 and 1934A classes. The structural integrity and Engine reliability was much improved and they were much better seagoing ships, shipping much less water through an improvement in the design of the bows. Z-21 was sunk on April 10th, 1940 in Battle of Narvik.