Switched to unique suffixes