The name User is ambiguous

[zsusag]

This is largely due to the fact that an organization is in fact a user of the system. Instead, we should have some way to differentiate the two implicitly. The current proposal for the name change is individual.

[iangreenleaf]

Another option to consider, especially if you are thinking about consolidating the Devise login stuff into a single model, is to name that Account and keep Organization and User for their purposes in the app logic.