[TASK] Use name-resolution instead of strings where possible: 4