PLA-768 Removed Api suffix + fixed class checking

Merge after QA!!

https://wikia-inc.atlassian.net/browse/PLA-768