Refactored names to comply with coding standards. Everything seems to work except COMPUTER moves