fixed naming issues here