Renames BinaryExpressionFactoryMethodMap and UnaryExpressionFactoryMethodMap to be more concise