Secretary of War

From the birth of the United States up till 1947 the branch of the federal government that dealt with military matters was called the War Department which was headed by the Secretary of War, a cabinet member. The Department of Defense was created along with the position of Secretary of Defense by the National Security Act of 1947. So what was the War Department and Secretary of War became the Department of Defense and the Secretary of Defense respectively.