fixed more var names