Renaming of category and other tweaks