fix another name collision