updated some var names to better match rest of app