Merge "Fix use of code name in services decorator"