Removed unused/confusing prefix & suffix for endpoints.