Be more consistent with baseUrls