diff --git a/lib/fp/mapping.js b/lib/fp/mapping.js
index 46f87c4a2..f9d39a46f 100644
--- a/lib/fp/mapping.js
+++ b/lib/fp/mapping.js
@@ -3,8 +3,8 @@ module.exports = {
   /** Used to map method names to their aliases. */
   'alias': {
     'ary': ['nAry'],
-    'overEvery': ['allPass'],
-    'overSome': ['somePass'],
+    'assignIn': ['extend'],
+    'assignInWith': ['extendWith'],
     'filter': ['whereEq'],
     'flatten': ['unnest'],
     'flow': ['pipe'],
@@ -19,8 +19,10 @@ module.exports = {
     'isEqual': ['equals'],
     'mapValues': ['mapObj'],
     'matchesProperty': ['pathEq'],
-    'overArgs': ['useWith'],
     'omit': ['dissoc', 'omitAll'],
+    'overArgs': ['useWith'],
+    'overEvery': ['allPass'],
+    'overSome': ['somePass'],
     'pick': ['pickAll'],
     'property': ['get'],
     'propertyOf': ['propOf'],
@@ -33,12 +35,12 @@ module.exports = {
   /** Used to map method names to their iteratee ary. */
   'aryIteratee': {
     'assignWith': 2,
+    'assignInWith': 2,
     'cloneDeepWith': 1,
     'cloneWith': 1,
     'dropRightWhile': 1,
     'dropWhile': 1,
     'every': 1,
-    'extendWith': 2,
     'filter': 1,
     'find': 1,
     'findIndex': 1,
@@ -88,11 +90,12 @@ module.exports = {
       'pullAt,random,range,rangeRight,rearg,reject,remove,repeat,result,sampleSize,' +
       'some,sortBy,sortedIndexBy,sortedLastIndexBy,sortedUniqBy,split,startsWith,' +
       'subtract,sumBy,take,takeRight,takeRightWhile,takeWhile,throttle,times,' +
-      'truncate,union,uniqBy,without,wrap,xor,zip,zipObject').split(','),
+      'truncate,union,uniqBy,uniqWith,without,wrap,xor,zip,zipObject').split(','),
     3: (
-      'assignWith,clamp,differenceBy,extendWith,getOr,inRange,intersectionBy,' +
-      'isEqualWith,isMatchWith,mergeWith,omitBy,pickBy,pullAllBy,reduce,' +
-      'reduceRight,replace,set,slice,transform,unionBy,xorBy,zipWith').split(','),
+      'assignWith,assignInWith,clamp,differenceBy,differenceWith,getOr,inRange,' +
+      'intersectionBy,intersectionWith,isEqualWith,isMatchWith,mergeWith,omitBy,' +
+      'pickBy,pullAllBy,reduce,reduceRight,replace,set,slice,transform,unionBy,' +
+      'unionWith,xorBy,xorWith,zipWith').split(','),
     4:
       ['fill', 'setWith']
   },
@@ -138,11 +141,11 @@ module.exports = {
     },
     'object': {
       'assign': true,
+      'assignIn': true,
+      'assignInWith': true,
       'assignWith': true,
       'defaults': true,
       'defaultsDeep': true,
-      'extend': true,
-      'extendWith': true,
       'merge': true,
       'mergeWith': true
     },
@@ -169,7 +172,6 @@ module.exports = {
     'defaults': true,
     'defaultsDeep': true,
     'difference': true,
-    'extend': true,
     'matchesProperty': true,
     'merge': true,
     'random': true,