(Xenon) Avoid some naming conflicts