Renamed internal ERC721 check function. (#1445)

(cherry picked from commit 384dff9abeee277f3357b8c472ef38a5ec825df3)

contracts/token/ERC721/ERC721.sol

@@ -200,7 +200,7 @@ contract ERC721 is ERC165, IERC721 {
   {
     transferFrom(from, to, tokenId);
     // solium-disable-next-line arg-overflow
-    require(_checkAndCallSafeTransfer(from, to, tokenId, _data));
+    require(_checkOnERC721Received(from, to, tokenId, _data));
   }
 
   /**
@@ -306,7 +306,7 @@ contract ERC721 is ERC165, IERC721 {
    * @param _data bytes optional data to send along with the call
    * @return whether the call correctly returned the expected magic value
    */
-  function _checkAndCallSafeTransfer(
+  function _checkOnERC721Received(
     address from,
     address to,
     uint256 tokenId,