reworking names for class methods