Issue #58: some renaming, shifting around