Fixed role names to include Head word