Changed naming to make it easier to test other clustering methods