Revert "name changes"

This reverts commit 6a426e17d212421287e27c9cf96899b8b50870fe.
Revert "Changing around how computer / player is initialized"

This reverts commit daa0e084f696ea6a7fbc63c8ddc3cac2ebbaaa08.