Take care of CamelCase in class name too.