Rename as suggested in review