Rename data directories

The new names are a little clearer.