Refactor of EndPoint to Endpoint

Change-Id: I50e5444356146233f618d6497ccc68b759fcc7be