Set up for latest endpoint_base
Fix parameteres names. Green build again