[NOJIRA] Labeling fixes

Controllers should be named appropriately =).