Fixes name errors