Fix some naming to make it easier to filter