Moved back to the original names of the engine.clients and engine.reserved_names fields.