Minor naming and category fixes.