Fixing count (function was not static)
Rename providers classes in api