added generic names for services