Fix naming and point to api
Fix warnings