better naming conventions per @ernie