Slightly changes in variables naming.