Fix same name bug