Hamartoma versus Choristoma

Hamartoma:

Disorganised but benign mass composed of cells indigenous to the involved site.

Choristoma:
Heterotopic rest of normal cells.