standardizing naming convention
more standardization even if it's wrong