Update active endpoints
Update class names with help from @LordRalex