Minor changes (better naming).