Renamed categories - closes #16