rollback nameplate changes
Merge branch 'master-csegames' into mehuge-ui