RIC-961:implement Xn and X2 component IDs correctly in E2M