Make variable names more consistant.