Fix name collision