Also rename the existing PutDescriptionInput to DescriptionInput. Change-Id: I8291e970353b8ae6ed4f0cbe5dce746007e25291