Fixed name collision issue