Quick search-replace fix for moving orm into spaf namespace