Fixed variables names x/y