Change names and handle regions better