Some name fixes