rename service files, correct announcement of service location
rename over capitalize