Codominance is the term describing the interaction between two alleles which result in a mix of the two in a heterozygous individual rather than the masking of a recessive one.
Epistasis is the term describing the interaction between alleles of different genes masking one another. For example if the tt genotype is present, it will mask the AA/Aa/aa genotype.