change name conventions in lib