final round of proper naming