Fixed mail controller names