fixed name collision for import