fixing a name collision