Rename data directories

These names are a little clearer.