Fix name confliction, Compile OK