Issue#381 category name

closes #381
closes #354