fixing name collision