Update for changes in Moonshine

Change-Id: I6f981d3eaf613eb0c426943a466b58bbd9f3860f
Reviewed-on: https://pirx.atteo.com/gerrit/421
Tested-by: Mr. Jenkins
Reviewed-by: Sławek Piotrowski <sentinel@atteo.com>