Chromoplast is the general term for a photosynthetic organelle.  Technically, a chloroplast is a particular chromoplast in which the dominant chlorophylls are A and B.