Service definition updated with better names.