Cleaned up directive name spaces.