Fix auth names
Fix mappers structure