Changed some name based errors

Still doesn't work