fix geometry names