Fixed name collision error