changed naming convention one more time and fixed readme