fixed most of the naming issues
code base looks better and it still works