took pass over standardizing naming conventions