Fix usename references