Fix possible name collision