Updates so the new screen id names conform to norms.

Change the screen id's to use `-` instead of `_` and append `-screen`.