Merge "Fix variables naming"