Rename some files and adjust some branding