Changed variable and method names