Changes variable and delegate method name to make it clear