Separate OSK name and display name
We'll need the name
for actions later on so let's simplify it right now. Pull in some fixes from the completion branch while at that.
We'll need the name
for actions later on so let's simplify it right now. Pull in some fixes from the completion branch while at that.