naming failure
Changes for new endpoint libs