Renaming to reflect class type