Fix all the names