Fix type conflict. Rename properties