Renaming and slight changes