Removed unneeded include/exclude methods on model objects
Centralized Organization name conversion and checking for bad names