Rename name_id parameter to NameID for consistency
Add SRAA api