Switching out to endpoint and registrationId to match spec and fixing up a stupid bug in the backend server