Changed variable and method convention