Minor changes for consistency with new observations file naming conventions