renamed to StrictReturnValueMap and renamed methods, fixed typos