fix def name collision