More consistent path names.