adjusting var names to normalize across a couple different packages...