refactor to correct name