Username consistency fix