ranamed lib -- again
ranaming in files
renaming in tests