Updates for new Moonshine

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