Eleven: Improve strings

Change-Id: I201942fca26c9279c8c363bca7538a2a1bc4cf7a