+1 for renaming to e.g. `base_map`, this should avoid future problems.

I can do that when I ported the remaining packages.