Change names to try to avoid issues 31 and 35