renaming and more commentary