some naming conventions were off