Rename the 'alias' column in Organization_Alias to 'name' because of keyword
Added all orgs, aliases, and many fine types (as many as I could think of)