Changed player-specific named objects to generic objects