Adjust variable/method names