Fixed name collision