(fix) refactoed names and changed auth type