More stuff and renaming