Renamed topics taxonomy to topic to be consistent with other taxonomy usage