fill in missing dependency
replace http-specific names with more generic ones