remove underscore naming in the new class because it's not consistent