Fixes name handling