You're not far wrong. The definition of the terms is slightly organic, however (haha!)Let me get this clear.
A bunch of amino acids join together. This is called a polypeptide.
A few polypeptides join together. The thing is STILL called a POLYPEPTIDE. (Like lego: several lego bricks make a lego block. When you stick two lego blocks together, its still called a lego block.)
When you FOLD the polypeptide, it becomes a PROTEIN.
In other words, a protein refers to a certain way of folding a polypeptide.
Remember that both proteins and polypeptides are polymers of amino acids and you can't go wrong.The words protein, polypeptide, and peptide are a little ambiguous and can overlap in meaning. Protein is generally used to refer to the complete biological molecule in a stable conformation, whereas peptide is generally reserved for a short amino acid oligomers often lacking a stable three-dimensional structure. However, the boundary between the two is not well defined and usually lies near 20–30 residues.[10] Polypeptide can refer to any single linear chain of amino acids, usually regardless of length, but often implies an absence of a defined conformation.