made quick changes

changes naming convention, so that it makes more sense to average
person.
changes naming convension

etc