Fixed missing refactoring to organizationname in some table and sql