Variable and method names changed according to the new pattern.