Replace lena with astronaut

This is based on #1126 
Another unrelated change?