Towards MKWS-294 (Change names of MKWS classes to be case-insensitive)