Pending renames from EndPoint to Endpoint

Change-Id: I19acfe084da98ada75aec640e5d428866f3941ce