Fix a new more random name quirks