Fixed bug with capitalising service name