Fixes names
Fixes names, and readds