name collision bug fixed