update to Huberts naming scheme