renamed class and test
implemented type based naming convention