Used standard conventions on end points of users (#209)