Fixing compilation warnings;
Renaming categories to follow convention;