basic renaming and improved structure