renamed a few components regarding the draft status