Variables names changed