fix autogen class names and BASED_ON comment