better naming convention & fixed README