Change name from functional to class