COM: updated names to more explicit version