PLA-768 Removed Api suffix + fixed class checking
Merge pull request #1545 from Wikia/PLA-768b

PLA-768 Removed Api suffix + fixed class checking