Add fix for separating name from ID