a little renaming and consolidation