Naming improvements. Fixes bug in SQL load order.