diff --git a/README.md b/README.md
index d859d5da..ee8dd328 100644
--- a/README.md
+++ b/README.md
@@ -89,8 +89,8 @@ location = location.reset_index(0).dropna()
 
 # Feature extraction
 features = nilo.extract_features(
-  lats=location['double_latitude'],
-  lons=location['double_longitude'],
+  lats=location['latitude'],
+  lons=location['longitude'],
   users=location['user'],
   groups=location['group'],
   times=location.index,
diff --git a/docs/user_guide/preprocessing/location.ipynb b/docs/user_guide/preprocessing/location.ipynb
index 46ff53ac..8339c898 100644
--- a/docs/user_guide/preprocessing/location.ipynb
+++ b/docs/user_guide/preprocessing/location.ipynb
@@ -22,8 +22,8 @@
     "Location data is expected to have the following columns (column names can be different, but in that case they must be provided as parameters):\n",
     "- `user`: Subject ID\n",
     "- `device`: Device ID\n",
-    "- `double_latitude`: Latitude as a floating point number\n",
-    "- `double_longitude`: Longitude as a floating point number\n",
+    "- `latitude`: Latitude as a floating point number\n",
+    "- `longitude`: Longitude as a floating point number\n",
     "\n",
     "Optional columns include:\n",
     "- `double_speed`: Speed measured at the location\n",
@@ -208,7 +208,120 @@
    "id": "86e7396c",
    "metadata": {},
    "source": [
-    "The necessary columns for further analysis are `double_latitude`, `double_longitude`, `double_speed`, and `user`. `user` refers to a unique identifier for a subject."
+    "For further analysis we need a `latitude`, `longitude`, `speed`, and `user` column. `user` refers to a unique identifier for a subject.\n",
+    "\n",
+    "These columsn exist in the data, but some column names are different. We could provide these column names as arguments, but it is easier to rename them here:"
+   ]
+  },
+  {
+   "cell_type": "code",
+   "execution_count": 4,
+   "id": "df3a2a0a",
+   "metadata": {},
+   "outputs": [
+    {
+     "data": {
+      "text/html": [
+       "<div>\n",
+       "<style scoped>\n",
+       "    .dataframe tbody tr th:only-of-type {\n",
+       "        vertical-align: middle;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe tbody tr th {\n",
+       "        vertical-align: top;\n",
+       "    }\n",
+       "\n",
+       "    .dataframe thead th {\n",
+       "        text-align: right;\n",
+       "    }\n",
+       "</style>\n",
+       "<table border=\"1\" class=\"dataframe\">\n",
+       "  <thead>\n",
+       "    <tr style=\"text-align: right;\">\n",
+       "      <th></th>\n",
+       "      <th>time</th>\n",
+       "      <th>latitude</th>\n",
+       "      <th>longitude</th>\n",
+       "      <th>speed</th>\n",
+       "      <th>user</th>\n",
+       "      <th>datetime</th>\n",
+       "    </tr>\n",
+       "  </thead>\n",
+       "  <tbody>\n",
+       "    <tr>\n",
+       "      <th>2013-03-27 06:03:29+02:00</th>\n",
+       "      <td>1364357009</td>\n",
+       "      <td>43.706667</td>\n",
+       "      <td>-72.289097</td>\n",
+       "      <td>0.00</td>\n",
+       "      <td>gps_u01</td>\n",
+       "      <td>2013-03-27 06:03:29+02:00</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2013-03-27 06:23:29+02:00</th>\n",
+       "      <td>1364358209</td>\n",
+       "      <td>43.706637</td>\n",
+       "      <td>-72.289066</td>\n",
+       "      <td>0.00</td>\n",
+       "      <td>gps_u01</td>\n",
+       "      <td>2013-03-27 06:23:29+02:00</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2013-03-27 06:43:25+02:00</th>\n",
+       "      <td>1364359405</td>\n",
+       "      <td>43.706678</td>\n",
+       "      <td>-72.289018</td>\n",
+       "      <td>0.25</td>\n",
+       "      <td>gps_u01</td>\n",
+       "      <td>2013-03-27 06:43:25+02:00</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2013-03-27 07:03:29+02:00</th>\n",
+       "      <td>1364360609</td>\n",
+       "      <td>43.706665</td>\n",
+       "      <td>-72.289087</td>\n",
+       "      <td>0.00</td>\n",
+       "      <td>gps_u01</td>\n",
+       "      <td>2013-03-27 07:03:29+02:00</td>\n",
+       "    </tr>\n",
+       "    <tr>\n",
+       "      <th>2013-03-27 07:23:25+02:00</th>\n",
+       "      <td>1364361805</td>\n",
+       "      <td>43.706808</td>\n",
+       "      <td>-72.289370</td>\n",
+       "      <td>0.00</td>\n",
+       "      <td>gps_u01</td>\n",
+       "      <td>2013-03-27 07:23:25+02:00</td>\n",
+       "    </tr>\n",
+       "  </tbody>\n",
+       "</table>\n",
+       "</div>"
+      ],
+      "text/plain": [
+       "                                 time   latitude  longitude  speed     user  \\\n",
+       "2013-03-27 06:03:29+02:00  1364357009  43.706667 -72.289097   0.00  gps_u01   \n",
+       "2013-03-27 06:23:29+02:00  1364358209  43.706637 -72.289066   0.00  gps_u01   \n",
+       "2013-03-27 06:43:25+02:00  1364359405  43.706678 -72.289018   0.25  gps_u01   \n",
+       "2013-03-27 07:03:29+02:00  1364360609  43.706665 -72.289087   0.00  gps_u01   \n",
+       "2013-03-27 07:23:25+02:00  1364361805  43.706808 -72.289370   0.00  gps_u01   \n",
+       "\n",
+       "                                           datetime  \n",
+       "2013-03-27 06:03:29+02:00 2013-03-27 06:03:29+02:00  \n",
+       "2013-03-27 06:23:29+02:00 2013-03-27 06:23:29+02:00  \n",
+       "2013-03-27 06:43:25+02:00 2013-03-27 06:43:25+02:00  \n",
+       "2013-03-27 07:03:29+02:00 2013-03-27 07:03:29+02:00  \n",
+       "2013-03-27 07:23:25+02:00 2013-03-27 07:23:25+02:00  "
+      ]
+     },
+     "execution_count": 4,
+     "metadata": {},
+     "output_type": "execute_result"
+    }
+   ],
+   "source": [
+    "data = data.rename(columns={\"double_latitude\": \"latitude\", \"double_longitude\": \"longitude\", \"double_speed\": \"speed\"})\n",
+    "data.head()"
    ]
   },
   {
@@ -235,7 +348,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 4,
+   "execution_count": 5,
    "id": "a96bdaa6",
    "metadata": {},
    "outputs": [
@@ -245,7 +358,7 @@
        "(9857, 6)"
       ]
      },
-     "execution_count": 4,
+     "execution_count": 5,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -290,7 +403,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 5,
+   "execution_count": 6,
    "id": "01aefd90",
    "metadata": {},
    "outputs": [
@@ -300,20 +413,20 @@
        "(9755, 5)"
       ]
      },
-     "execution_count": 5,
+     "execution_count": 6,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
     "binned_data = niimpy.util.aggregate(data, freq='5min', method_numerical='median')\n",
-    "binned_data = binned_data.reset_index(0).dropna()\n",
+    "binned_data = binned_data.dropna()\n",
     "binned_data.shape"
    ]
   },
   {
    "cell_type": "code",
-   "execution_count": 6,
+   "execution_count": 7,
    "id": "d7027bec",
    "metadata": {},
    "outputs": [
@@ -340,9 +453,9 @@
        "      <th></th>\n",
        "      <th>user</th>\n",
        "      <th>time</th>\n",
-       "      <th>double_latitude</th>\n",
-       "      <th>double_longitude</th>\n",
-       "      <th>double_speed</th>\n",
+       "      <th>latitude</th>\n",
+       "      <th>longitude</th>\n",
+       "      <th>speed</th>\n",
        "    </tr>\n",
        "  </thead>\n",
        "  <tbody>\n",
@@ -386,96 +499,26 @@
        "      <td>-72.329240</td>\n",
        "      <td>0.0</td>\n",
        "    </tr>\n",
-       "    <tr>\n",
-       "      <th>...</th>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "      <td>...</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>2013-05-29 16:10:00+03:00</th>\n",
-       "      <td>gps_u01</td>\n",
-       "      <td>1.369833e+09</td>\n",
-       "      <td>43.706711</td>\n",
-       "      <td>-72.289205</td>\n",
-       "      <td>0.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>2013-05-29 16:20:00+03:00</th>\n",
-       "      <td>gps_u01</td>\n",
-       "      <td>1.369834e+09</td>\n",
-       "      <td>43.706708</td>\n",
-       "      <td>-72.289162</td>\n",
-       "      <td>0.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>2013-05-29 16:30:00+03:00</th>\n",
-       "      <td>gps_u01</td>\n",
-       "      <td>1.369834e+09</td>\n",
-       "      <td>43.706725</td>\n",
-       "      <td>-72.289149</td>\n",
-       "      <td>0.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>2013-05-29 16:40:00+03:00</th>\n",
-       "      <td>gps_u01</td>\n",
-       "      <td>1.369835e+09</td>\n",
-       "      <td>43.706697</td>\n",
-       "      <td>-72.289165</td>\n",
-       "      <td>0.0</td>\n",
-       "    </tr>\n",
-       "    <tr>\n",
-       "      <th>2013-05-29 16:50:00+03:00</th>\n",
-       "      <td>gps_u01</td>\n",
-       "      <td>1.369836e+09</td>\n",
-       "      <td>43.706713</td>\n",
-       "      <td>-72.289191</td>\n",
-       "      <td>0.0</td>\n",
-       "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
-       "<p>9755 rows × 5 columns</p>\n",
        "</div>"
       ],
       "text/plain": [
-       "                              user          time  double_latitude  \\\n",
-       "2013-03-27 06:00:00+02:00  gps_u00  1.364357e+09        43.759135   \n",
-       "2013-03-27 06:20:00+02:00  gps_u00  1.364358e+09        43.759503   \n",
-       "2013-03-27 06:40:00+02:00  gps_u00  1.364359e+09        43.759134   \n",
-       "2013-03-27 07:00:00+02:00  gps_u00  1.364361e+09        43.759135   \n",
-       "2013-03-27 07:20:00+02:00  gps_u00  1.364362e+09        43.759135   \n",
-       "...                            ...           ...              ...   \n",
-       "2013-05-29 16:10:00+03:00  gps_u01  1.369833e+09        43.706711   \n",
-       "2013-05-29 16:20:00+03:00  gps_u01  1.369834e+09        43.706708   \n",
-       "2013-05-29 16:30:00+03:00  gps_u01  1.369834e+09        43.706725   \n",
-       "2013-05-29 16:40:00+03:00  gps_u01  1.369835e+09        43.706697   \n",
-       "2013-05-29 16:50:00+03:00  gps_u01  1.369836e+09        43.706713   \n",
-       "\n",
-       "                           double_longitude  double_speed  \n",
-       "2013-03-27 06:00:00+02:00        -72.329240           0.0  \n",
-       "2013-03-27 06:20:00+02:00        -72.329018           0.0  \n",
-       "2013-03-27 06:40:00+02:00        -72.329238           0.0  \n",
-       "2013-03-27 07:00:00+02:00        -72.329240           0.0  \n",
-       "2013-03-27 07:20:00+02:00        -72.329240           0.0  \n",
-       "...                                     ...           ...  \n",
-       "2013-05-29 16:10:00+03:00        -72.289205           0.0  \n",
-       "2013-05-29 16:20:00+03:00        -72.289162           0.0  \n",
-       "2013-05-29 16:30:00+03:00        -72.289149           0.0  \n",
-       "2013-05-29 16:40:00+03:00        -72.289165           0.0  \n",
-       "2013-05-29 16:50:00+03:00        -72.289191           0.0  \n",
-       "\n",
-       "[9755 rows x 5 columns]"
+       "                              user          time   latitude  longitude  speed\n",
+       "2013-03-27 06:00:00+02:00  gps_u00  1.364357e+09  43.759135 -72.329240    0.0\n",
+       "2013-03-27 06:20:00+02:00  gps_u00  1.364358e+09  43.759503 -72.329018    0.0\n",
+       "2013-03-27 06:40:00+02:00  gps_u00  1.364359e+09  43.759134 -72.329238    0.0\n",
+       "2013-03-27 07:00:00+02:00  gps_u00  1.364361e+09  43.759135 -72.329240    0.0\n",
+       "2013-03-27 07:20:00+02:00  gps_u00  1.364362e+09  43.759135 -72.329240    0.0"
       ]
      },
-     "execution_count": 6,
+     "execution_count": 7,
      "metadata": {},
      "output_type": "execute_result"
     }
    ],
    "source": [
-    "binned_data"
+    "binned_data.head()"
    ]
   },
   {
@@ -532,7 +575,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 7,
+   "execution_count": 8,
    "id": "5bf0185c",
    "metadata": {},
    "outputs": [
@@ -559,25 +602,25 @@
        "      <th></th>\n",
        "      <th>user</th>\n",
        "      <th>n_significant_places</th>\n",
+       "      <th>n_home</th>\n",
        "      <th>n_sps</th>\n",
-       "      <th>n_static</th>\n",
+       "      <th>normalized_entropy</th>\n",
        "      <th>n_moving</th>\n",
-       "      <th>n_rare</th>\n",
-       "      <th>n_home</th>\n",
+       "      <th>n_top4</th>\n",
        "      <th>max_dist_home</th>\n",
-       "      <th>n_transitions</th>\n",
-       "      <th>n_top1</th>\n",
-       "      <th>...</th>\n",
        "      <th>n_top5</th>\n",
+       "      <th>n_rare</th>\n",
+       "      <th>...</th>\n",
+       "      <th>n_top1</th>\n",
        "      <th>entropy</th>\n",
-       "      <th>normalized_entropy</th>\n",
+       "      <th>n_transitions</th>\n",
+       "      <th>variance</th>\n",
+       "      <th>log_variance</th>\n",
        "      <th>dist_total</th>\n",
-       "      <th>n_bins</th>\n",
        "      <th>speed_average</th>\n",
-       "      <th>speed_variance</th>\n",
        "      <th>speed_max</th>\n",
-       "      <th>variance</th>\n",
-       "      <th>log_variance</th>\n",
+       "      <th>n_bins</th>\n",
+       "      <th>speed_variance</th>\n",
        "    </tr>\n",
        "  </thead>\n",
        "  <tbody>\n",
@@ -585,169 +628,169 @@
        "      <th>2013-03-31 00:00:00+02:00</th>\n",
        "      <td>gps_u00</td>\n",
        "      <td>6</td>\n",
+       "      <td>97.0</td>\n",
        "      <td>5.0</td>\n",
-       "      <td>280.0</td>\n",
-       "      <td>8.0</td>\n",
-       "      <td>3.0</td>\n",
-       "      <td>106.0</td>\n",
+       "      <td>3.006920</td>\n",
+       "      <td>54.0</td>\n",
+       "      <td>18.0</td>\n",
        "      <td>2.074186e+04</td>\n",
-       "      <td>48.0</td>\n",
-       "      <td>106.0</td>\n",
+       "      <td>8.0</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>...</td>\n",
-       "      <td>18.0</td>\n",
-       "      <td>5.091668</td>\n",
-       "      <td>3.163631</td>\n",
-       "      <td>4.132581e+05</td>\n",
-       "      <td>288.0</td>\n",
-       "      <td>0.033496</td>\n",
-       "      <td>0.044885</td>\n",
-       "      <td>1.750000</td>\n",
+       "      <td>98.0</td>\n",
+       "      <td>4.839451</td>\n",
+       "      <td>25.0</td>\n",
        "      <td>0.003146</td>\n",
        "      <td>-5.761688</td>\n",
+       "      <td>4.132581e+05</td>\n",
+       "      <td>1.116127</td>\n",
+       "      <td>17.284037</td>\n",
+       "      <td>288.0</td>\n",
+       "      <td>9.876405</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-04-30 00:00:00+03:00</th>\n",
        "      <td>gps_u00</td>\n",
        "      <td>10</td>\n",
-       "      <td>10.0</td>\n",
-       "      <td>1966.0</td>\n",
-       "      <td>66.0</td>\n",
-       "      <td>45.0</td>\n",
-       "      <td>1010.0</td>\n",
+       "      <td>969.0</td>\n",
+       "      <td>8.0</td>\n",
+       "      <td>3.045317</td>\n",
+       "      <td>318.0</td>\n",
+       "      <td>37.0</td>\n",
        "      <td>2.914790e+05</td>\n",
-       "      <td>194.0</td>\n",
-       "      <td>1016.0</td>\n",
+       "      <td>18.0</td>\n",
+       "      <td>18.0</td>\n",
        "      <td>...</td>\n",
-       "      <td>38.0</td>\n",
-       "      <td>7.284903</td>\n",
-       "      <td>3.163793</td>\n",
-       "      <td>2.179693e+06</td>\n",
-       "      <td>2032.0</td>\n",
-       "      <td>0.269932</td>\n",
-       "      <td>6.129277</td>\n",
-       "      <td>33.250000</td>\n",
+       "      <td>976.0</td>\n",
+       "      <td>6.332559</td>\n",
+       "      <td>97.0</td>\n",
        "      <td>0.237133</td>\n",
        "      <td>-1.439133</td>\n",
+       "      <td>2.179693e+06</td>\n",
+       "      <td>0.821680</td>\n",
+       "      <td>33.831053</td>\n",
+       "      <td>2032.0</td>\n",
+       "      <td>9.970465</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-05-31 00:00:00+03:00</th>\n",
        "      <td>gps_u00</td>\n",
        "      <td>15</td>\n",
-       "      <td>12.0</td>\n",
-       "      <td>1827.0</td>\n",
-       "      <td>76.0</td>\n",
-       "      <td>86.0</td>\n",
-       "      <td>1028.0</td>\n",
+       "      <td>1007.0</td>\n",
+       "      <td>9.0</td>\n",
+       "      <td>3.110317</td>\n",
+       "      <td>255.0</td>\n",
+       "      <td>43.0</td>\n",
        "      <td>1.041741e+06</td>\n",
-       "      <td>107.0</td>\n",
-       "      <td>1030.0</td>\n",
+       "      <td>38.0</td>\n",
+       "      <td>31.0</td>\n",
        "      <td>...</td>\n",
-       "      <td>46.0</td>\n",
-       "      <td>6.701177</td>\n",
-       "      <td>2.696752</td>\n",
-       "      <td>6.986551e+06</td>\n",
-       "      <td>1903.0</td>\n",
-       "      <td>0.351280</td>\n",
-       "      <td>7.590639</td>\n",
-       "      <td>34.000000</td>\n",
+       "      <td>1009.0</td>\n",
+       "      <td>6.834065</td>\n",
+       "      <td>69.0</td>\n",
        "      <td>8.288687</td>\n",
        "      <td>2.114892</td>\n",
+       "      <td>6.986551e+06</td>\n",
+       "      <td>0.847341</td>\n",
+       "      <td>42.507751</td>\n",
+       "      <td>1903.0</td>\n",
+       "      <td>15.081070</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-06-30 00:00:00+03:00</th>\n",
        "      <td>gps_u00</td>\n",
        "      <td>1</td>\n",
-       "      <td>1.0</td>\n",
-       "      <td>22.0</td>\n",
-       "      <td>2.0</td>\n",
-       "      <td>15.0</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>2.035837e+04</td>\n",
-       "      <td>10.0</td>\n",
-       "      <td>15.0</td>\n",
-       "      <td>...</td>\n",
        "      <td>0.0</td>\n",
        "      <td>0.000000</td>\n",
+       "      <td>18.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>1.989381e+04</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>6.0</td>\n",
+       "      <td>...</td>\n",
+       "      <td>6.0</td>\n",
        "      <td>0.000000</td>\n",
-       "      <td>2.252893e+05</td>\n",
-       "      <td>24.0</td>\n",
-       "      <td>0.044126</td>\n",
-       "      <td>0.021490</td>\n",
-       "      <td>0.559017</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>0.014991</td>\n",
        "      <td>-4.200287</td>\n",
+       "      <td>2.252893e+05</td>\n",
+       "      <td>14.601880</td>\n",
+       "      <td>43.321397</td>\n",
+       "      <td>24.0</td>\n",
+       "      <td>242.791725</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-03-31 00:00:00+02:00</th>\n",
        "      <td>gps_u01</td>\n",
        "      <td>4</td>\n",
+       "      <td>273.0</td>\n",
        "      <td>2.0</td>\n",
-       "      <td>307.0</td>\n",
-       "      <td>18.0</td>\n",
+       "      <td>2.584963</td>\n",
+       "      <td>12.0</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>260.0</td>\n",
        "      <td>6.975303e+02</td>\n",
-       "      <td>8.0</td>\n",
-       "      <td>286.0</td>\n",
-       "      <td>...</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>3.044522</td>\n",
-       "      <td>4.392317</td>\n",
-       "      <td>1.328713e+04</td>\n",
-       "      <td>325.0</td>\n",
-       "      <td>0.056290</td>\n",
-       "      <td>0.073370</td>\n",
-       "      <td>2.692582</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>...</td>\n",
+       "      <td>307.0</td>\n",
+       "      <td>1.791759</td>\n",
+       "      <td>4.0</td>\n",
        "      <td>0.000004</td>\n",
        "      <td>-12.520989</td>\n",
+       "      <td>1.328713e+04</td>\n",
+       "      <td>0.029994</td>\n",
+       "      <td>0.744393</td>\n",
+       "      <td>325.0</td>\n",
+       "      <td>0.008880</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-04-30 00:00:00+03:00</th>\n",
        "      <td>gps_u01</td>\n",
        "      <td>4</td>\n",
-       "      <td>1.0</td>\n",
-       "      <td>1999.0</td>\n",
-       "      <td>71.0</td>\n",
-       "      <td>1.0</td>\n",
-       "      <td>1500.0</td>\n",
-       "      <td>1.156568e+04</td>\n",
+       "      <td>1492.0</td>\n",
        "      <td>2.0</td>\n",
-       "      <td>1998.0</td>\n",
-       "      <td>...</td>\n",
+       "      <td>5.977280</td>\n",
+       "      <td>78.0</td>\n",
        "      <td>0.0</td>\n",
-       "      <td>0.000000</td>\n",
-       "      <td>0.000000</td>\n",
-       "      <td>1.238429e+05</td>\n",
-       "      <td>2070.0</td>\n",
-       "      <td>0.066961</td>\n",
-       "      <td>0.629393</td>\n",
-       "      <td>32.750000</td>\n",
+       "      <td>1.156568e+04</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>1.0</td>\n",
+       "      <td>...</td>\n",
+       "      <td>1928.0</td>\n",
+       "      <td>4.143135</td>\n",
+       "      <td>26.0</td>\n",
        "      <td>0.000027</td>\n",
        "      <td>-10.510017</td>\n",
+       "      <td>1.238429e+05</td>\n",
+       "      <td>0.050416</td>\n",
+       "      <td>16.992157</td>\n",
+       "      <td>2070.0</td>\n",
+       "      <td>0.237219</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-05-31 00:00:00+03:00</th>\n",
        "      <td>gps_u01</td>\n",
        "      <td>2</td>\n",
+       "      <td>42.0</td>\n",
        "      <td>1.0</td>\n",
-       "      <td>3079.0</td>\n",
-       "      <td>34.0</td>\n",
-       "      <td>1.0</td>\n",
-       "      <td>45.0</td>\n",
-       "      <td>3.957650e+03</td>\n",
-       "      <td>2.0</td>\n",
-       "      <td>3078.0</td>\n",
-       "      <td>...</td>\n",
-       "      <td>0.0</td>\n",
        "      <td>0.000000</td>\n",
+       "      <td>110.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>6.771047e+02</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>0.0</td>\n",
+       "      <td>...</td>\n",
+       "      <td>3003.0</td>\n",
        "      <td>0.000000</td>\n",
-       "      <td>1.228235e+05</td>\n",
-       "      <td>3113.0</td>\n",
-       "      <td>0.026392</td>\n",
-       "      <td>0.261978</td>\n",
-       "      <td>20.250000</td>\n",
+       "      <td>0.0</td>\n",
        "      <td>0.000012</td>\n",
        "      <td>-11.364454</td>\n",
+       "      <td>1.228235e+05</td>\n",
+       "      <td>0.044657</td>\n",
+       "      <td>9.967899</td>\n",
+       "      <td>3113.0</td>\n",
+       "      <td>0.085366</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
@@ -755,64 +798,64 @@
        "</div>"
       ],
       "text/plain": [
-       "                              user  n_significant_places  n_sps  n_static  \\\n",
-       "2013-03-31 00:00:00+02:00  gps_u00                     6    5.0     280.0   \n",
-       "2013-04-30 00:00:00+03:00  gps_u00                    10   10.0    1966.0   \n",
-       "2013-05-31 00:00:00+03:00  gps_u00                    15   12.0    1827.0   \n",
-       "2013-06-30 00:00:00+03:00  gps_u00                     1    1.0      22.0   \n",
-       "2013-03-31 00:00:00+02:00  gps_u01                     4    2.0     307.0   \n",
-       "2013-04-30 00:00:00+03:00  gps_u01                     4    1.0    1999.0   \n",
-       "2013-05-31 00:00:00+03:00  gps_u01                     2    1.0    3079.0   \n",
+       "                              user  n_significant_places  n_home  n_sps  \\\n",
+       "2013-03-31 00:00:00+02:00  gps_u00                     6    97.0    5.0   \n",
+       "2013-04-30 00:00:00+03:00  gps_u00                    10   969.0    8.0   \n",
+       "2013-05-31 00:00:00+03:00  gps_u00                    15  1007.0    9.0   \n",
+       "2013-06-30 00:00:00+03:00  gps_u00                     1     0.0    0.0   \n",
+       "2013-03-31 00:00:00+02:00  gps_u01                     4   273.0    2.0   \n",
+       "2013-04-30 00:00:00+03:00  gps_u01                     4  1492.0    2.0   \n",
+       "2013-05-31 00:00:00+03:00  gps_u01                     2    42.0    1.0   \n",
        "\n",
-       "                           n_moving  n_rare  n_home  max_dist_home  \\\n",
-       "2013-03-31 00:00:00+02:00       8.0     3.0   106.0   2.074186e+04   \n",
-       "2013-04-30 00:00:00+03:00      66.0    45.0  1010.0   2.914790e+05   \n",
-       "2013-05-31 00:00:00+03:00      76.0    86.0  1028.0   1.041741e+06   \n",
-       "2013-06-30 00:00:00+03:00       2.0    15.0     0.0   2.035837e+04   \n",
-       "2013-03-31 00:00:00+02:00      18.0     0.0   260.0   6.975303e+02   \n",
-       "2013-04-30 00:00:00+03:00      71.0     1.0  1500.0   1.156568e+04   \n",
-       "2013-05-31 00:00:00+03:00      34.0     1.0    45.0   3.957650e+03   \n",
+       "                           normalized_entropy  n_moving  n_top4  \\\n",
+       "2013-03-31 00:00:00+02:00            3.006920      54.0    18.0   \n",
+       "2013-04-30 00:00:00+03:00            3.045317     318.0    37.0   \n",
+       "2013-05-31 00:00:00+03:00            3.110317     255.0    43.0   \n",
+       "2013-06-30 00:00:00+03:00            0.000000      18.0     0.0   \n",
+       "2013-03-31 00:00:00+02:00            2.584963      12.0     0.0   \n",
+       "2013-04-30 00:00:00+03:00            5.977280      78.0     0.0   \n",
+       "2013-05-31 00:00:00+03:00            0.000000     110.0     0.0   \n",
        "\n",
-       "                           n_transitions  n_top1  ...  n_top5   entropy  \\\n",
-       "2013-03-31 00:00:00+02:00           48.0   106.0  ...    18.0  5.091668   \n",
-       "2013-04-30 00:00:00+03:00          194.0  1016.0  ...    38.0  7.284903   \n",
-       "2013-05-31 00:00:00+03:00          107.0  1030.0  ...    46.0  6.701177   \n",
-       "2013-06-30 00:00:00+03:00           10.0    15.0  ...     0.0  0.000000   \n",
-       "2013-03-31 00:00:00+02:00            8.0   286.0  ...     0.0  3.044522   \n",
-       "2013-04-30 00:00:00+03:00            2.0  1998.0  ...     0.0  0.000000   \n",
-       "2013-05-31 00:00:00+03:00            2.0  3078.0  ...     0.0  0.000000   \n",
+       "                           max_dist_home  n_top5  n_rare  ...  n_top1  \\\n",
+       "2013-03-31 00:00:00+02:00   2.074186e+04     8.0     0.0  ...    98.0   \n",
+       "2013-04-30 00:00:00+03:00   2.914790e+05    18.0    18.0  ...   976.0   \n",
+       "2013-05-31 00:00:00+03:00   1.041741e+06    38.0    31.0  ...  1009.0   \n",
+       "2013-06-30 00:00:00+03:00   1.989381e+04     0.0     6.0  ...     6.0   \n",
+       "2013-03-31 00:00:00+02:00   6.975303e+02     0.0     0.0  ...   307.0   \n",
+       "2013-04-30 00:00:00+03:00   1.156568e+04     0.0     1.0  ...  1928.0   \n",
+       "2013-05-31 00:00:00+03:00   6.771047e+02     0.0     0.0  ...  3003.0   \n",
        "\n",
-       "                           normalized_entropy    dist_total  n_bins  \\\n",
-       "2013-03-31 00:00:00+02:00            3.163631  4.132581e+05   288.0   \n",
-       "2013-04-30 00:00:00+03:00            3.163793  2.179693e+06  2032.0   \n",
-       "2013-05-31 00:00:00+03:00            2.696752  6.986551e+06  1903.0   \n",
-       "2013-06-30 00:00:00+03:00            0.000000  2.252893e+05    24.0   \n",
-       "2013-03-31 00:00:00+02:00            4.392317  1.328713e+04   325.0   \n",
-       "2013-04-30 00:00:00+03:00            0.000000  1.238429e+05  2070.0   \n",
-       "2013-05-31 00:00:00+03:00            0.000000  1.228235e+05  3113.0   \n",
+       "                            entropy  n_transitions  variance  log_variance  \\\n",
+       "2013-03-31 00:00:00+02:00  4.839451           25.0  0.003146     -5.761688   \n",
+       "2013-04-30 00:00:00+03:00  6.332559           97.0  0.237133     -1.439133   \n",
+       "2013-05-31 00:00:00+03:00  6.834065           69.0  8.288687      2.114892   \n",
+       "2013-06-30 00:00:00+03:00  0.000000            0.0  0.014991     -4.200287   \n",
+       "2013-03-31 00:00:00+02:00  1.791759            4.0  0.000004    -12.520989   \n",
+       "2013-04-30 00:00:00+03:00  4.143135           26.0  0.000027    -10.510017   \n",
+       "2013-05-31 00:00:00+03:00  0.000000            0.0  0.000012    -11.364454   \n",
        "\n",
-       "                           speed_average  speed_variance  speed_max  variance  \\\n",
-       "2013-03-31 00:00:00+02:00       0.033496        0.044885   1.750000  0.003146   \n",
-       "2013-04-30 00:00:00+03:00       0.269932        6.129277  33.250000  0.237133   \n",
-       "2013-05-31 00:00:00+03:00       0.351280        7.590639  34.000000  8.288687   \n",
-       "2013-06-30 00:00:00+03:00       0.044126        0.021490   0.559017  0.014991   \n",
-       "2013-03-31 00:00:00+02:00       0.056290        0.073370   2.692582  0.000004   \n",
-       "2013-04-30 00:00:00+03:00       0.066961        0.629393  32.750000  0.000027   \n",
-       "2013-05-31 00:00:00+03:00       0.026392        0.261978  20.250000  0.000012   \n",
+       "                             dist_total  speed_average  speed_max  n_bins  \\\n",
+       "2013-03-31 00:00:00+02:00  4.132581e+05       1.116127  17.284037   288.0   \n",
+       "2013-04-30 00:00:00+03:00  2.179693e+06       0.821680  33.831053  2032.0   \n",
+       "2013-05-31 00:00:00+03:00  6.986551e+06       0.847341  42.507751  1903.0   \n",
+       "2013-06-30 00:00:00+03:00  2.252893e+05      14.601880  43.321397    24.0   \n",
+       "2013-03-31 00:00:00+02:00  1.328713e+04       0.029994   0.744393   325.0   \n",
+       "2013-04-30 00:00:00+03:00  1.238429e+05       0.050416  16.992157  2070.0   \n",
+       "2013-05-31 00:00:00+03:00  1.228235e+05       0.044657   9.967899  3113.0   \n",
        "\n",
-       "                           log_variance  \n",
-       "2013-03-31 00:00:00+02:00     -5.761688  \n",
-       "2013-04-30 00:00:00+03:00     -1.439133  \n",
-       "2013-05-31 00:00:00+03:00      2.114892  \n",
-       "2013-06-30 00:00:00+03:00     -4.200287  \n",
-       "2013-03-31 00:00:00+02:00    -12.520989  \n",
-       "2013-04-30 00:00:00+03:00    -10.510017  \n",
-       "2013-05-31 00:00:00+03:00    -11.364454  \n",
+       "                           speed_variance  \n",
+       "2013-03-31 00:00:00+02:00        9.876405  \n",
+       "2013-04-30 00:00:00+03:00        9.970465  \n",
+       "2013-05-31 00:00:00+03:00       15.081070  \n",
+       "2013-06-30 00:00:00+03:00      242.791725  \n",
+       "2013-03-31 00:00:00+02:00        0.008880  \n",
+       "2013-04-30 00:00:00+03:00        0.237219  \n",
+       "2013-05-31 00:00:00+03:00        0.085366  \n",
        "\n",
        "[7 rows x 23 columns]"
       ]
      },
-     "execution_count": 7,
+     "execution_count": 8,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -828,7 +871,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 8,
+   "execution_count": 9,
    "id": "d2b2e06b",
    "metadata": {},
    "outputs": [
@@ -854,118 +897,118 @@
        "    <tr style=\"text-align: right;\">\n",
        "      <th></th>\n",
        "      <th>user</th>\n",
+       "      <th>variance</th>\n",
+       "      <th>log_variance</th>\n",
        "      <th>dist_total</th>\n",
-       "      <th>n_bins</th>\n",
        "      <th>speed_average</th>\n",
-       "      <th>speed_variance</th>\n",
        "      <th>speed_max</th>\n",
-       "      <th>variance</th>\n",
-       "      <th>log_variance</th>\n",
+       "      <th>n_bins</th>\n",
+       "      <th>speed_variance</th>\n",
        "    </tr>\n",
        "  </thead>\n",
        "  <tbody>\n",
        "    <tr>\n",
        "      <th>2013-03-31 00:00:00+02:00</th>\n",
        "      <td>gps_u00</td>\n",
-       "      <td>4.132581e+05</td>\n",
-       "      <td>288.0</td>\n",
-       "      <td>0.033496</td>\n",
-       "      <td>0.044885</td>\n",
-       "      <td>1.750000</td>\n",
        "      <td>0.003146</td>\n",
        "      <td>-5.761688</td>\n",
+       "      <td>4.132581e+05</td>\n",
+       "      <td>1.116127</td>\n",
+       "      <td>17.284037</td>\n",
+       "      <td>288.0</td>\n",
+       "      <td>9.876405</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-04-30 00:00:00+03:00</th>\n",
        "      <td>gps_u00</td>\n",
-       "      <td>2.179693e+06</td>\n",
-       "      <td>2032.0</td>\n",
-       "      <td>0.269932</td>\n",
-       "      <td>6.129277</td>\n",
-       "      <td>33.250000</td>\n",
        "      <td>0.237133</td>\n",
        "      <td>-1.439133</td>\n",
+       "      <td>2.179693e+06</td>\n",
+       "      <td>0.821680</td>\n",
+       "      <td>33.831053</td>\n",
+       "      <td>2032.0</td>\n",
+       "      <td>9.970465</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-05-31 00:00:00+03:00</th>\n",
        "      <td>gps_u00</td>\n",
-       "      <td>6.986551e+06</td>\n",
-       "      <td>1903.0</td>\n",
-       "      <td>0.351280</td>\n",
-       "      <td>7.590639</td>\n",
-       "      <td>34.000000</td>\n",
        "      <td>8.288687</td>\n",
        "      <td>2.114892</td>\n",
+       "      <td>6.986551e+06</td>\n",
+       "      <td>0.847341</td>\n",
+       "      <td>42.507751</td>\n",
+       "      <td>1903.0</td>\n",
+       "      <td>15.081070</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-06-30 00:00:00+03:00</th>\n",
        "      <td>gps_u00</td>\n",
-       "      <td>2.252893e+05</td>\n",
-       "      <td>24.0</td>\n",
-       "      <td>0.044126</td>\n",
-       "      <td>0.021490</td>\n",
-       "      <td>0.559017</td>\n",
        "      <td>0.014991</td>\n",
        "      <td>-4.200287</td>\n",
+       "      <td>2.252893e+05</td>\n",
+       "      <td>14.601880</td>\n",
+       "      <td>43.321397</td>\n",
+       "      <td>24.0</td>\n",
+       "      <td>242.791725</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-03-31 00:00:00+02:00</th>\n",
        "      <td>gps_u01</td>\n",
-       "      <td>1.328713e+04</td>\n",
-       "      <td>325.0</td>\n",
-       "      <td>0.056290</td>\n",
-       "      <td>0.073370</td>\n",
-       "      <td>2.692582</td>\n",
        "      <td>0.000004</td>\n",
        "      <td>-12.520989</td>\n",
+       "      <td>1.328713e+04</td>\n",
+       "      <td>0.029994</td>\n",
+       "      <td>0.744393</td>\n",
+       "      <td>325.0</td>\n",
+       "      <td>0.008880</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-04-30 00:00:00+03:00</th>\n",
        "      <td>gps_u01</td>\n",
-       "      <td>1.238429e+05</td>\n",
-       "      <td>2070.0</td>\n",
-       "      <td>0.066961</td>\n",
-       "      <td>0.629393</td>\n",
-       "      <td>32.750000</td>\n",
        "      <td>0.000027</td>\n",
        "      <td>-10.510017</td>\n",
+       "      <td>1.238429e+05</td>\n",
+       "      <td>0.050416</td>\n",
+       "      <td>16.992157</td>\n",
+       "      <td>2070.0</td>\n",
+       "      <td>0.237219</td>\n",
        "    </tr>\n",
        "    <tr>\n",
        "      <th>2013-05-31 00:00:00+03:00</th>\n",
        "      <td>gps_u01</td>\n",
-       "      <td>1.228235e+05</td>\n",
-       "      <td>3113.0</td>\n",
-       "      <td>0.026392</td>\n",
-       "      <td>0.261978</td>\n",
-       "      <td>20.250000</td>\n",
        "      <td>0.000012</td>\n",
        "      <td>-11.364454</td>\n",
+       "      <td>1.228235e+05</td>\n",
+       "      <td>0.044657</td>\n",
+       "      <td>9.967899</td>\n",
+       "      <td>3113.0</td>\n",
+       "      <td>0.085366</td>\n",
        "    </tr>\n",
        "  </tbody>\n",
        "</table>\n",
        "</div>"
       ],
       "text/plain": [
-       "                              user    dist_total  n_bins  speed_average  \\\n",
-       "2013-03-31 00:00:00+02:00  gps_u00  4.132581e+05   288.0       0.033496   \n",
-       "2013-04-30 00:00:00+03:00  gps_u00  2.179693e+06  2032.0       0.269932   \n",
-       "2013-05-31 00:00:00+03:00  gps_u00  6.986551e+06  1903.0       0.351280   \n",
-       "2013-06-30 00:00:00+03:00  gps_u00  2.252893e+05    24.0       0.044126   \n",
-       "2013-03-31 00:00:00+02:00  gps_u01  1.328713e+04   325.0       0.056290   \n",
-       "2013-04-30 00:00:00+03:00  gps_u01  1.238429e+05  2070.0       0.066961   \n",
-       "2013-05-31 00:00:00+03:00  gps_u01  1.228235e+05  3113.0       0.026392   \n",
+       "                              user  variance  log_variance    dist_total  \\\n",
+       "2013-03-31 00:00:00+02:00  gps_u00  0.003146     -5.761688  4.132581e+05   \n",
+       "2013-04-30 00:00:00+03:00  gps_u00  0.237133     -1.439133  2.179693e+06   \n",
+       "2013-05-31 00:00:00+03:00  gps_u00  8.288687      2.114892  6.986551e+06   \n",
+       "2013-06-30 00:00:00+03:00  gps_u00  0.014991     -4.200287  2.252893e+05   \n",
+       "2013-03-31 00:00:00+02:00  gps_u01  0.000004    -12.520989  1.328713e+04   \n",
+       "2013-04-30 00:00:00+03:00  gps_u01  0.000027    -10.510017  1.238429e+05   \n",
+       "2013-05-31 00:00:00+03:00  gps_u01  0.000012    -11.364454  1.228235e+05   \n",
        "\n",
-       "                           speed_variance  speed_max  variance  log_variance  \n",
-       "2013-03-31 00:00:00+02:00        0.044885   1.750000  0.003146     -5.761688  \n",
-       "2013-04-30 00:00:00+03:00        6.129277  33.250000  0.237133     -1.439133  \n",
-       "2013-05-31 00:00:00+03:00        7.590639  34.000000  8.288687      2.114892  \n",
-       "2013-06-30 00:00:00+03:00        0.021490   0.559017  0.014991     -4.200287  \n",
-       "2013-03-31 00:00:00+02:00        0.073370   2.692582  0.000004    -12.520989  \n",
-       "2013-04-30 00:00:00+03:00        0.629393  32.750000  0.000027    -10.510017  \n",
-       "2013-05-31 00:00:00+03:00        0.261978  20.250000  0.000012    -11.364454  "
+       "                           speed_average  speed_max  n_bins  speed_variance  \n",
+       "2013-03-31 00:00:00+02:00       1.116127  17.284037   288.0        9.876405  \n",
+       "2013-04-30 00:00:00+03:00       0.821680  33.831053  2032.0        9.970465  \n",
+       "2013-05-31 00:00:00+03:00       0.847341  42.507751  1903.0       15.081070  \n",
+       "2013-06-30 00:00:00+03:00      14.601880  43.321397    24.0      242.791725  \n",
+       "2013-03-31 00:00:00+02:00       0.029994   0.744393   325.0        0.008880  \n",
+       "2013-04-30 00:00:00+03:00       0.050416  16.992157  2070.0        0.237219  \n",
+       "2013-05-31 00:00:00+03:00       0.044657   9.967899  3113.0        0.085366  "
       ]
      },
-     "execution_count": 8,
+     "execution_count": 9,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -1010,19 +1053,19 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 9,
+   "execution_count": 10,
    "id": "e602497e",
    "metadata": {},
    "outputs": [
     {
      "data": {
       "text/plain": [
-       "{<function niimpy.preprocessing.location.location_number_of_significant_places(df, config={})>: {'resample_args': {'rule': '1M'}},\n",
-       " <function niimpy.preprocessing.location.location_significant_place_features(df, config={})>: {'resample_args': {'rule': '1M'}},\n",
-       " <function niimpy.preprocessing.location.location_distance_features(df, config={})>: {'resample_args': {'rule': '1M'}}}"
+       "{<function niimpy.preprocessing.location.location_number_of_significant_places(df, config=None)>: {'resample_args': {'rule': '1ME'}},\n",
+       " <function niimpy.preprocessing.location.location_significant_place_features(df, config=None)>: {'resample_args': {'rule': '1ME'}},\n",
+       " <function niimpy.preprocessing.location.location_distance_features(df, config=None)>: {'resample_args': {'rule': '1ME'}}}"
       ]
      },
-     "execution_count": 9,
+     "execution_count": 10,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -1033,7 +1076,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 10,
+   "execution_count": 11,
    "id": "6a042466",
    "metadata": {},
    "outputs": [
@@ -1060,9 +1103,9 @@
        "      <th></th>\n",
        "      <th>user</th>\n",
        "      <th>time</th>\n",
-       "      <th>double_latitude</th>\n",
-       "      <th>double_longitude</th>\n",
-       "      <th>double_speed</th>\n",
+       "      <th>latitude</th>\n",
+       "      <th>longitude</th>\n",
+       "      <th>speed</th>\n",
        "    </tr>\n",
        "  </thead>\n",
        "  <tbody>\n",
@@ -1111,22 +1154,15 @@
        "</div>"
       ],
       "text/plain": [
-       "                              user          time  double_latitude  \\\n",
-       "2013-03-27 06:00:00+02:00  gps_u00  1.364357e+09        43.759135   \n",
-       "2013-03-27 06:20:00+02:00  gps_u00  1.364358e+09        43.759503   \n",
-       "2013-03-27 06:40:00+02:00  gps_u00  1.364359e+09        43.759134   \n",
-       "2013-03-27 07:00:00+02:00  gps_u00  1.364361e+09        43.759135   \n",
-       "2013-03-27 07:20:00+02:00  gps_u00  1.364362e+09        43.759135   \n",
-       "\n",
-       "                           double_longitude  double_speed  \n",
-       "2013-03-27 06:00:00+02:00        -72.329240           0.0  \n",
-       "2013-03-27 06:20:00+02:00        -72.329018           0.0  \n",
-       "2013-03-27 06:40:00+02:00        -72.329238           0.0  \n",
-       "2013-03-27 07:00:00+02:00        -72.329240           0.0  \n",
-       "2013-03-27 07:20:00+02:00        -72.329240           0.0  "
+       "                              user          time   latitude  longitude  speed\n",
+       "2013-03-27 06:00:00+02:00  gps_u00  1.364357e+09  43.759135 -72.329240    0.0\n",
+       "2013-03-27 06:20:00+02:00  gps_u00  1.364358e+09  43.759503 -72.329018    0.0\n",
+       "2013-03-27 06:40:00+02:00  gps_u00  1.364359e+09  43.759134 -72.329238    0.0\n",
+       "2013-03-27 07:00:00+02:00  gps_u00  1.364361e+09  43.759135 -72.329240    0.0\n",
+       "2013-03-27 07:20:00+02:00  gps_u00  1.364362e+09  43.759135 -72.329240    0.0"
       ]
      },
-     "execution_count": 10,
+     "execution_count": 11,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -1146,7 +1182,7 @@
   },
   {
    "cell_type": "code",
-   "execution_count": 11,
+   "execution_count": 12,
    "id": "81d9d0d1",
    "metadata": {},
    "outputs": [
@@ -1172,7 +1208,7 @@
        "    <tr style=\"text-align: right;\">\n",
        "      <th></th>\n",
        "      <th>user</th>\n",
-       "      <th>double_speed</th>\n",
+       "      <th>speed</th>\n",
        "    </tr>\n",
        "  </thead>\n",
        "  <tbody>\n",
@@ -1191,12 +1227,12 @@
        "</div>"
       ],
       "text/plain": [
-       "      user  double_speed\n",
-       "0  gps_u00         34.00\n",
-       "1  gps_u01         32.75"
+       "      user  speed\n",
+       "0  gps_u00  34.00\n",
+       "1  gps_u01  32.75"
       ]
      },
-     "execution_count": 11,
+     "execution_count": 12,
      "metadata": {},
      "output_type": "execute_result"
     }
@@ -1205,7 +1241,7 @@
     "# customized function\n",
     "def max_speed(df, feature_arg):\n",
     "    grouped = df.groupby('user')\n",
-    "    df = grouped['double_speed'].max().reset_index('user')\n",
+    "    df = grouped['speed'].max().reset_index('user')\n",
     "    return df\n",
     "\n",
     "customized_features = nilo.extract_features_location(\n",
diff --git a/niimpy/preprocessing/location.py b/niimpy/preprocessing/location.py
index 2ec7249f..8439374b 100644
--- a/niimpy/preprocessing/location.py
+++ b/niimpy/preprocessing/location.py
@@ -65,8 +65,8 @@ def filter_location(location,
                     remove_disabled=True,
                     remove_zeros=True,
                     remove_network=False,
-                    latitude_column = "double_latitude",
-                    longitude_column = "double_longitude",
+                    latitude_column = "latitude",
+                    longitude_column = "longitude",
                     label_column = "label",
                     provider_column = "provider",
                     ):
@@ -268,8 +268,8 @@ def location_number_of_significant_places(df, config=None):
         config = {}
     assert isinstance(config, dict), "config is not a dictionary"
     
-    latitude_column = config.get("latitude_column", "double_latitude")
-    longitude_column = config.get("longitude_column", "double_longitude")
+    latitude_column = config.get("latitude_column", "latitude")
+    longitude_column = config.get("longitude_column", "longitude")
     config["resample_args"] = config.get("resample_args", {"rule": default_freq})
 
     def compute_features(df):
@@ -335,8 +335,8 @@ def location_significant_place_features(df, config=None):
     config: A dictionary of optional arguments
 
     Optional arguments in config:
-        longitude_column: The name of the column with longitude data in a floating point format. Defaults to 'double_longitude'. 
-        latitude_column: The name of the column with latitude data in a floating point format. Defaults to 'double_latitude'.
+        longitude_column: The name of the column with longitude data in a floating point format. Defaults to 'longitude'. 
+        latitude_column: The name of the column with latitude data in a floating point format. Defaults to 'latitude'.
         speed_column: The name of the column with speed data in a floating point format. Defaults to 'double_speed'.
         resample_args: a dictionary of arguments for the Pandas resample function. For example to resample by hour, you would pass {"rule": "1h"}.
     """
@@ -345,8 +345,8 @@ def location_significant_place_features(df, config=None):
         config = {}
     assert isinstance(config, dict), "config is not a dictionary"
 
-    latitude_column = config.get("latitude_column", "double_latitude")
-    longitude_column = config.get("longitude_column", "double_latitude")
+    latitude_column = config.get("latitude_column", "latitude")
+    longitude_column = config.get("longitude_column", "latitude")
     speed_column = config.get("speed_column", "double_speed")
     speed_threshold = config.get("speed_threshold", 0.277)
     config["resample_args"] = config.get("resample_args", {"rule": default_freq})
@@ -436,8 +436,8 @@ def location_distance_features(df, config=None):
     config: A dictionary of optional arguments
 
     Optional arguments in config:
-        longitude_column: The name of the column with longitude data in a floating point format. Defaults to 'double_longitude'. 
-        latitude_column: The name of the column with latitude data in a floating point format. Defaults to 'double_latitude'.
+        longitude_column: The name of the column with longitude data in a floating point format. Defaults to 'longitude'. 
+        latitude_column: The name of the column with latitude data in a floating point format. Defaults to 'latitude'.
         speed_column: The name of the column with speed data in a floating point format. Defaults to 'double_speed'.
         resample_args: a dictionary of arguments for the Pandas resample function. For example to resample by hour, you would pass {"rule": "1h"}.
     """
@@ -446,8 +446,8 @@ def location_distance_features(df, config=None):
         config = {}
     assert isinstance(config, dict), "config is not a dictionary"
 
-    latitude_column = config.get("latitude_column", "double_latitude")
-    longitude_column = config.get("longitude_column", "double_latitude")
+    latitude_column = config.get("latitude_column", "latitude")
+    longitude_column = config.get("longitude_column", "latitude")
     speed_column = config.get("speed_column", "double_speed")
     config["resample_args"] = config.get("resample_args", {"rule": default_freq})
 
@@ -505,7 +505,7 @@ def extract_features_location(df, features=None):
     ----------
     df : pd.DataFrame
         dataframe of location data. It must contain these columns:
-        `double_latitude`, `double_longitude`, `user`, `group`.
+        `latitude`, `longitude`, `user`, `group`.
         `double_speed` is optional. If not provided, it will be
         computed manually.
     speed_threshold : float