Minor improvements to dependency file namings and contents