Revert "Code cleanup."

This reverts commit 3e5200c2d7ba1f8dea4c41501652927082ba0a55.
Revert "Revert "Code cleanup.""

This reverts commit 52b2e9fb6a8bf3514e9bd53d41b20f38dd064eae.
Fix renaming when game titles are displayed
Small tweak to ab72b8622316ccf3a940ceead36469688cbbb9cd
Merge remote-tracking branch 'upstream/master'