Change to more unified naming

Export and import corresponds to each other