Refactored standin player and weapon names.  Movement of files useful for testing, moving back counts as change.