Changed variable namnes according to general standard