Fix names and errors