Refactored naming and added all services to all interfaces.