Fix the include dir
Make the lib work with the new API
Fix the naming