added categories and unified some names