Merge "Remove custom service Class -> name mapping"