Global Peformance Evaluation - Capital Gain vs Market return

I may have missed it in Schweser or the CFAI text but there appears to be two different versions of decomposition of returns around. Decomposition is separate from Global Attribution. In the 2007 exam the question asked for “Market”, Currency and Security Selection returns which sum to Total wtd return in domestic currency. Note that this is market as in wt of portfolio x local index return. In CFAI text problems 1,2 and 5. The problems ask for Capital Gains returns and Currency contribution. Security selection is asked separately. Cap Gains and Currency sum to total wtd return in domestic currency. Cap Gains is calculated as wt of portfolio x local portfolio return. Subtle differences but worth pointing out.