yes, you are correct. E = trans and Z = cis. The E/Z system only works for alkenes. Cis/trans can be used for most organic compounds with multiple stereogenic centers, however. For example - think 1,2-cyclohexanediol. That compound could be represented as cis or trans depending on the stereochemistry. R and S can be used as well. Also, keep in mind that all cis/trans and E/Z isomers are diasteriomers.